From: Dave Airlie <airlied@redhat.com>
Date: Tue, 13 Dec 2016 16:41:05 +1000
Subject: drm/amd/display: remove dc hub - this seems unused.
Git-commit: 1964cb736aaa094379d47aa1dc056a5531cecbd6
Patch-mainline: v4.15-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166
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>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
drivers/gpu/drm/amd/display/dc/core/dc.c | 27 ---------------
drivers/gpu/drm/amd/display/dc/dc.h | 17 ---------
drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input.c | 1
drivers/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(-)
--- 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
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;
-
-}
-
--- 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_ini
void dc_destroy(struct dc **dc);
-bool dc_init_dchub(struct dc *dc, struct dchub_init_data *dh_data);
-
/*******************************************************************************
* Surface Interfaces
******************************************************************************/
--- 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
dce_mem_input_program_surface_config,
.mem_input_is_flip_pending =
dce110_mem_input_is_flip_pending,
- .mem_input_update_dchub = NULL
};
/*****************************************/
/* Constructor, Destructor */
--- 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_
dce_mem_input_program_surface_config,
.mem_input_is_flip_pending =
dce110_mem_input_is_flip_pending,
- .mem_input_update_dchub = NULL
};
/*****************************************/
--- 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