drm/amd/display: Remove legacy code in DC

This commit just remove some trivial legacy code in some of the DC
files.

Acked-by: Wayne Lin <wayne.lin@amd.com>
Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c b/drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c
index bfc042209007339be85b9c16fe2a3622df95d1f7..17a21bcbde17220225f6a932027a18c49a5fb000 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c
@@ -762,23 +762,11 @@ void dcn316_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_param
                                break;
                        }
                }
-               // Ported from DCN315
-               if (clk_table->num_entries == 1) {
-                       /*smu gives one DPM level, let's take the highest one*/
-                       closest_clk_lvl = dcn3_16_soc.num_states - 1;
-               }
 
                s[i].state = i;
 
                /* Clocks dependent on voltage level. */
                s[i].dcfclk_mhz = clk_table->entries[i].dcfclk_mhz;
-               if (clk_table->num_entries == 1 &&
-                   s[i].dcfclk_mhz <
-                   dcn3_16_soc.clock_limits[closest_clk_lvl].dcfclk_mhz) {
-                       /*SMU fix not released yet*/
-                       s[i].dcfclk_mhz =
-                               dcn3_16_soc.clock_limits[closest_clk_lvl].dcfclk_mhz;
-               }
                s[i].fabricclk_mhz = clk_table->entries[i].fclk_mhz;
                s[i].socclk_mhz = clk_table->entries[i].socclk_mhz;
                s[i].dram_speed_mts = clk_table->entries[i].memclk_mhz *

diff --git a/drivers/gpu/drm/amd/display/dc/hwss/Makefile b/drivers/gpu/drm/amd/display/dc/hwss/Makefile
index ba55050be161137a48a5648f5736a02368204988..40ecebea1ba07550f60b906d01b28c6e31a11346 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/hwss/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/hwss/Makefile
@@ -110,10 +110,6 @@ AMD_DISPLAY_FILES += $(AMD_DAL_HWSS_DCN21)
 
 ###############################################################################
 
-###############################################################################
-
-###############################################################################
-
 HWSS_DCN30 = dcn30_hwseq.o dcn30_init.o
 
 AMD_DAL_HWSS_DCN30 = $(addprefix $(AMDDALPATH)/dc/hwss/dcn30/,$(HWSS_DCN30))
@@ -188,8 +184,6 @@ AMD_DISPLAY_FILES += $(AMD_DAL_HWSS_DCN351)
 
 ###############################################################################
 
-###############################################################################
-
 HWSS_DCN401 = dcn401_hwseq.o dcn401_init.o
 
 AMD_DAL_HWSS_DCN401 = $(addprefix $(AMDDALPATH)/dc/hwss/dcn401/,$(HWSS_DCN401))

diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.h b/drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.h
index 76b16839486a50e841ff7ab529ed49a4ec184070..6a153e7ce910efb6384858348c66d9412dabab83 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.h
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.h
@@ -27,7 +27,7 @@
 #define __DC_HWSS_DCN30_H__
 
 #include "hw_sequencer_private.h"
-#include "dcn20/dcn20_hwseq.h"
+
 struct dc;
 
 void dcn30_init_hw(struct dc *dc);

diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn301/dcn301_init.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn301/dcn301_init.c
index 6477009ce0654d3b71cd8e41d410655307a0da5d..0e5c037e82a68f5bb314f4f198f8ad0788ab08e0 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/hwss/dcn301/dcn301_init.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn301/dcn301_init.c
@@ -53,9 +53,6 @@ static const struct hw_sequencer_funcs dcn301_funcs = {
        .enable_stream = dcn20_enable_stream,
        .disable_stream = dce110_disable_stream,
        .unblank_stream = dcn20_unblank_stream,
-#ifdef FREESYNC_POWER_OPTIMIZE
-       .are_streams_coarse_grain_aligned = dcn20_are_streams_coarse_grain_aligned,
-#endif
        .blank_stream = dce110_blank_stream,
        .enable_audio_stream = dce110_enable_audio_stream,
        .disable_audio_stream = dce110_disable_audio_stream,

diff --git a/drivers/gpu/drm/amd/display/dc/os_types.h b/drivers/gpu/drm/amd/display/dc/os_types.h
index 6c4578d347af0179f2a7a43d84669d7932b52121..f2ba76c1e0c092cb276aa3ddf1bf31a3cb086573 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/os_types.h
+++ b/drivers/gpu/drm/amd/display/dc/os_types.h
@@ -29,8 +29,6 @@
 
 #include <linux/slab.h>
 #include <linux/kgdb.h>
-#include <linux/kref.h>
-#include <linux/types.h>
 #include <linux/delay.h>
 #include <linux/mm.h>