[PATCH 1/8] dc: remove dc hub - this seems unused.
Dave Airlie
airlied at gmail.com
Tue Dec 13 06:41:05 UTC 2016
From: Dave Airlie <airlied at redhat.com>
Signed-off-by: Dave Airlie <airlied at redhat.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 | 3 ---
5 files changed, 49 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 8e1d695..8697d7c 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1828,30 +1828,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 5f60800..376981e 100644
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -157,21 +157,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 */
@@ -192,8 +177,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 af9d682..a28bb4d 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
@@ -396,7 +396,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..d960db6 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
@@ -98,9 +98,6 @@ struct mem_input_funcs {
bool horizontal_mirror);
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.9.3
More information about the amd-gfx
mailing list