Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amd/display: Drop legacy code

Display code keeps getting improvements, and because of that, some
legacy code is left behind. This commit drops some of those unused
codes.

Acked-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Rodrigo Siqueira and committed by
Alex Deucher
22c3b09e 6a068e64

-57
-4
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c
··· 185 185 VBIOSSMC_MSG_SetHardMinDcfclkByFreq, 186 186 khz_to_mhz_ceil(requested_dcfclk_khz)); 187 187 188 - #ifdef DBG 189 - smu_print("actual_dcfclk_set_mhz %d is set to : %d\n", actual_dcfclk_set_mhz, actual_dcfclk_set_mhz * 1000); 190 - #endif 191 - 192 188 return actual_dcfclk_set_mhz * 1000; 193 189 } 194 190
-4
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c
··· 180 180 VBIOSSMC_MSG_SetHardMinDcfclkByFreq, 181 181 khz_to_mhz_ceil(requested_dcfclk_khz)); 182 182 183 - #ifdef DBG 184 - smu_print("actual_dcfclk_set_mhz %d is set to : %d\n", actual_dcfclk_set_mhz, actual_dcfclk_set_mhz * 1000); 185 - #endif 186 - 187 183 return actual_dcfclk_set_mhz * 1000; 188 184 } 189 185
-4
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c
··· 202 202 VBIOSSMC_MSG_SetHardMinDcfclkByFreq, 203 203 khz_to_mhz_ceil(requested_dcfclk_khz)); 204 204 205 - #ifdef DBG 206 - smu_print("actual_dcfclk_set_mhz %d is set to : %d\n", actual_dcfclk_set_mhz, actual_dcfclk_set_mhz * 1000); 207 - #endif 208 - 209 205 return actual_dcfclk_set_mhz * 1000; 210 206 } 211 207
-6
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_smu.c
··· 220 220 VBIOSSMC_MSG_SetHardMinDcfclkByFreq, 221 221 khz_to_mhz_ceil(requested_dcfclk_khz)); 222 222 223 - #ifdef DBG 224 - smu_print("actual_dcfclk_set_mhz %d is set to : %d\n", 225 - actual_dcfclk_set_mhz, 226 - actual_dcfclk_set_mhz * 1000); 227 - #endif 228 - 229 223 return actual_dcfclk_set_mhz * 1000; 230 224 } 231 225
-4
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c
··· 215 215 VBIOSSMC_MSG_SetHardMinDcfclkByFreq, 216 216 khz_to_mhz_ceil(requested_dcfclk_khz)); 217 217 218 - #ifdef DBG 219 - smu_print("actual_dcfclk_set_mhz %d is set to : %d\n", actual_dcfclk_set_mhz, actual_dcfclk_set_mhz * 1000); 220 - #endif 221 - 222 218 return actual_dcfclk_set_mhz * 1000; 223 219 } 224 220
-4
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c
··· 189 189 VBIOSSMC_MSG_SetHardMinDcfclkByFreq, 190 190 khz_to_mhz_ceil(requested_dcfclk_khz)); 191 191 192 - #ifdef DBG 193 - smu_print("actual_dcfclk_set_mhz %d is set to : %d\n", actual_dcfclk_set_mhz, actual_dcfclk_set_mhz * 1000); 194 - #endif 195 - 196 192 return actual_dcfclk_set_mhz * 1000; 197 193 } 198 194
-17
drivers/gpu/drm/amd/display/dc/core/dc_resource.c
··· 1871 1871 1872 1872 bool resource_is_pipe_type(const struct pipe_ctx *pipe_ctx, enum pipe_type type) 1873 1873 { 1874 - #ifdef DBG 1875 - if (pipe_ctx->stream == NULL) { 1876 - /* a free pipe with dangling states */ 1877 - ASSERT(!pipe_ctx->plane_state); 1878 - ASSERT(!pipe_ctx->prev_odm_pipe); 1879 - ASSERT(!pipe_ctx->next_odm_pipe); 1880 - ASSERT(!pipe_ctx->top_pipe); 1881 - ASSERT(!pipe_ctx->bottom_pipe); 1882 - } else if (pipe_ctx->top_pipe) { 1883 - /* a secondary DPP pipe must be signed to a plane */ 1884 - ASSERT(pipe_ctx->plane_state) 1885 - } 1886 - /* Add more checks here to prevent corrupted pipe ctx. It is very hard 1887 - * to debug this issue afterwards because we can't pinpoint the code 1888 - * location causing inconsistent pipe context states. 1889 - */ 1890 - #endif 1891 1874 switch (type) { 1892 1875 case OTG_MASTER: 1893 1876 return !pipe_ctx->prev_odm_pipe &&
-1
drivers/gpu/drm/amd/display/dmub/dmub_srv.h
··· 450 450 struct dmub_srv_base_funcs funcs; 451 451 struct dmub_srv_hw_funcs *hw_funcs; 452 452 void *user_ctx; 453 - struct dc_context *dc_ctx; 454 453 enum dmub_asic asic; 455 454 uint32_t fw_version; 456 455 bool is_virtual;
-11
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
··· 26 26 #ifndef DMUB_CMD_H 27 27 #define DMUB_CMD_H 28 28 29 - #if defined(_TEST_HARNESS) || defined(FPGA_USB4) 30 - #include "dmub_fw_types.h" 31 - #include "include_legacy/atomfirmware.h" 32 - 33 - #if defined(_TEST_HARNESS) 34 - #include <string.h> 35 - #endif 36 - #else 37 - 38 29 #include <asm/byteorder.h> 39 30 #include <linux/types.h> 40 31 #include <linux/string.h> 41 32 #include <linux/delay.h> 42 33 43 34 #include "atomfirmware.h" 44 - 45 - #endif // defined(_TEST_HARNESS) || defined(FPGA_USB4) 46 35 47 36 //<DMUB_TYPES>================================================================== 48 37 /* Basic type definitions. */
-2
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c
··· 32 32 #include "dcn/dcn_3_2_0_offset.h" 33 33 #include "dcn/dcn_3_2_0_sh_mask.h" 34 34 35 - #define DCN_BASE__INST0_SEG2 0x000034C0 36 - 37 35 #define BASE_INNER(seg) ctx->dcn_reg_offsets[seg] 38 36 #define CTX dmub 39 37 #define REGS dmub->regs_dcn32