amdgpu/dc: kill some deadcode in dc core.

Moves one function to an inline, but kills a bunch of deadcode.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-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 c8235b041b5b857c83af9889529f6af3c9e79850..1ec8248546c55cf5e5b8ea03a162864f08a51509 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -575,30 +575,6 @@ fail:
        return false;
 }
 
-/*
-void ProgramPixelDurationV(unsigned int pixelClockInKHz )
-{
-       fixed31_32 pixel_duration = Fixed31_32(100000000, pixelClockInKHz) * 10;
-       unsigned int pixDurationInPico = round(pixel_duration);
-
-       DPG_PIPE_ARBITRATION_CONTROL1 arb_control;
-
-       arb_control.u32All = ReadReg (mmDPGV0_PIPE_ARBITRATION_CONTROL1);
-       arb_control.bits.PIXEL_DURATION = pixDurationInPico;
-       WriteReg (mmDPGV0_PIPE_ARBITRATION_CONTROL1, arb_control.u32All);
-
-       arb_control.u32All = ReadReg (mmDPGV1_PIPE_ARBITRATION_CONTROL1);
-       arb_control.bits.PIXEL_DURATION = pixDurationInPico;
-       WriteReg (mmDPGV1_PIPE_ARBITRATION_CONTROL1, arb_control.u32All);
-
-       WriteReg (mmDPGV0_PIPE_ARBITRATION_CONTROL2, 0x4000800);
-       WriteReg (mmDPGV0_REPEATER_PROGRAM, 0x11);
-
-       WriteReg (mmDPGV1_PIPE_ARBITRATION_CONTROL2, 0x4000800);
-       WriteReg (mmDPGV1_REPEATER_PROGRAM, 0x11);
-}
-*/
-
 /*******************************************************************************
  * Public functions
  ******************************************************************************/
@@ -1518,28 +1494,6 @@ struct dc_stream_state *dc_get_stream_at_index(struct dc *dc, uint8_t i)
        return NULL;
 }
 
-struct dc_link *dc_get_link_at_index(struct dc *dc, uint32_t link_index)
-{
-       return dc->links[link_index];
-}
-
-const struct graphics_object_id dc_get_link_id_at_index(
-       struct dc *dc, uint32_t link_index)
-{
-       return dc->links[link_index]->link_id;
-}
-
-enum dc_irq_source dc_get_hpd_irq_source_at_index(
-       struct dc *dc, uint32_t link_index)
-{
-       return dc->links[link_index]->irq_source_hpd;
-}
-
-const struct audio **dc_get_audios(struct dc *dc)
-{
-       return (const struct audio **)dc->res_pool->audios;
-}
-
 enum dc_irq_source dc_interrupt_to_irq_source(
                struct dc *dc,
                uint32_t src_id,
@@ -1789,17 +1743,6 @@ fail_add_sink:
        return NULL;
 }
 
-void dc_link_set_sink(struct dc_link *link, struct dc_sink *sink)
-{
-       link->local_sink = sink;
-
-       if (sink == NULL) {
-               link->type = dc_connection_none;
-       } else {
-               link->type = dc_connection_single;
-       }
-}
-
 void dc_link_remove_remote_sink(struct dc_link *link, struct dc_sink *sink)
 {
        int i;
@@ -1825,37 +1768,3 @@ void dc_link_remove_remote_sink(struct dc_link *link, struct dc_sink *sink)
                }
        }
 }
-
-bool dc_init_dchub(struct dc *dc, struct dchub_init_data *dh_data)
-{
-       int i;
-       struct mem_input *mi = NULL;
-
-       for (i = 0; i < dc->res_pool->pipe_count; i++) {
-               if (dc->res_pool->mis[i] != NULL) {
-                       mi = dc->res_pool->mis[i];
-                       break;
-               }
-       }
-       if (mi == NULL) {
-               dm_error("no mem_input!\n");
-               return false;
-       }
-
-       if (dc->hwss.update_dchub)
-               dc->hwss.update_dchub(dc->hwseq, dh_data);
-       else
-               ASSERT(dc->hwss.update_dchub);
-
-
-       return true;
-
-}
-
-void dc_log_hw_state(struct dc *dc)
-{
-
-       if (dc->hwss.log_hw_state)
-               dc->hwss.log_hw_state(dc);
-}
-

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 9c0e00050753b20683b1ae099554339ee228eeb5..259ac69185647ae707b65068c634421fdae30e56 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -277,10 +277,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);
-
-void dc_log_hw_state(struct dc *dc);
-
 /*******************************************************************************
  * Surface Interfaces
  ******************************************************************************/
@@ -866,7 +862,10 @@ const struct dc_link_status *dc_link_get_status(const struct dc_link *dc_link);
  * boot time.  They cannot be created or destroyed.
  * Use dc_get_caps() to get number of links.
  */
-struct dc_link *dc_get_link_at_index(struct dc *dc, uint32_t link_index);
+static inline struct dc_link *dc_get_link_at_index(struct dc *dc, uint32_t link_index)
+{
+       return dc->links[link_index];
+}
 
 /* Set backlight level of an embedded panel (eDP, LVDS). */
 bool dc_link_set_backlight_level(const struct dc_link *dc_link, uint32_t level,