1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
|
From b487671f8875db044db208e5c4c11c670aa5c415 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 13 Dec 2016 16:41:05 +1000
Subject: [PATCH 0077/4131] drm/amd/display: remove dc hub - this seems unused.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/display/dc/core/dc.c | 27 ----------------------
drivers/gpu/drm/amd/display/dc/dc.h | 17 --------------
.../drm/amd/display/dc/dce110/dce110_mem_input.c | 1 -
.../gpu/drm/amd/display/dc/dce80/dce80_mem_input.c | 1 -
drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 2 --
5 files changed, 48 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index df1bae8..891075e 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1871,30 +1871,3 @@ const struct dc_stream_status *dc_stream_get_status(
return &stream->status;
}
-bool dc_init_dchub(struct dc *dc, struct dchub_init_data *dh_data)
-{
- int i;
- struct core_dc *core_dc = DC_TO_CORE(dc);
- struct mem_input *mi = NULL;
-
- for (i = 0; i < core_dc->res_pool->pipe_count; i++) {
- if (core_dc->res_pool->mis[i] != NULL) {
- mi = core_dc->res_pool->mis[i];
- break;
- }
- }
- if (mi == NULL) {
- dm_error("no mem_input!\n");
- return false;
- }
-
- if (mi->funcs->mem_input_update_dchub)
- mi->funcs->mem_input_update_dchub(mi, dh_data);
- else
- ASSERT(mi->funcs->mem_input_update_dchub);
-
-
- return true;
-
-}
-
diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 3f30afc..63090a2 100644
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -159,21 +159,6 @@ struct dc {
struct dc_debug debug;
};
-enum frame_buffer_mode {
- FRAME_BUFFER_MODE_LOCAL_ONLY = 0,
- FRAME_BUFFER_MODE_ZFB_ONLY,
- FRAME_BUFFER_MODE_MIXED_ZFB_AND_LOCAL,
-} ;
-
-struct dchub_init_data {
- bool dchub_initialzied;
- bool dchub_info_valid;
- int64_t zfb_phys_addr_base;
- int64_t zfb_mc_base_addr;
- uint64_t zfb_size_in_byte;
- enum frame_buffer_mode fb_mode;
-};
-
struct dc_init_data {
struct hw_asic_id asic_id;
void *driver; /* ctx */
@@ -194,8 +179,6 @@ struct dc *dc_create(const struct dc_init_data *init_params);
void dc_destroy(struct dc **dc);
-bool dc_init_dchub(struct dc *dc, struct dchub_init_data *dh_data);
-
/*******************************************************************************
* Surface Interfaces
******************************************************************************/
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input.c
index a20feae..1643fb5 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input.c
@@ -409,7 +409,6 @@ static struct mem_input_funcs dce110_mem_input_funcs = {
dce_mem_input_program_surface_config,
.mem_input_is_flip_pending =
dce110_mem_input_is_flip_pending,
- .mem_input_update_dchub = NULL
};
/*****************************************/
/* Constructor, Destructor */
diff --git a/drivers/gpu/drm/amd/display/dc/dce80/dce80_mem_input.c b/drivers/gpu/drm/amd/display/dc/dce80/dce80_mem_input.c
index ebb8df3..704a7ce 100644
--- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_mem_input.c
+++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_mem_input.c
@@ -54,7 +54,6 @@ static struct mem_input_funcs dce80_mem_input_funcs = {
dce_mem_input_program_surface_config,
.mem_input_is_flip_pending =
dce110_mem_input_is_flip_pending,
- .mem_input_update_dchub = NULL
};
/*****************************************/
diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h b/drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h
index 80566c8..2c0774f 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h
@@ -99,8 +99,6 @@ struct mem_input_funcs {
bool (*mem_input_is_flip_pending)(struct mem_input *mem_input);
- void (*mem_input_update_dchub)(struct mem_input *mem_input,
- struct dchub_init_data *dh_data);
};
#endif
--
2.7.4
|
