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>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index df1bae8ea92bac83bf4dba638c4a2bc5c5479c84..891075e39ecfdae6823666e1a4e2faa4a1a3225d 100644 (file)
--- 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 ffea10c73275575d59a373509f83fe9b3e247593..f786a17de1fd68e367fc9dd8ca57aaedad5d9acc 100644 (file)
--- 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 a20feaedfca4f886b94ad525782a26e0e2fb5f0f..1643fb5d4b04c8a690ca9143c1328359a472b998 100644 (file)
--- 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 ebb8df3cdf4afdaceba9bc8b674c82ebb68737e8..704a7ce62080768adbc642f7cf5bacfe8d0afe90 100644 (file)
--- 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 80566c844758cf5ce977c00f5ab75e62d37fcb61..2c0774f95c1c7c4887208274487017a128b10499 100644 (file)
--- 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