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

drm/amd/pm: Remove unneeded legacy DPM related code.

This code isn't needed anymore as we collect the same information
into pm_display_cfg instead.

Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Timur Kristóf and committed by
Alex Deucher
156db7d3 9d73b107

-89
-1
drivers/gpu/drm/amd/amdgpu/amdgpu.h
··· 434 434 uint32_t default_mclk; 435 435 uint32_t default_sclk; 436 436 uint32_t default_dispclk; 437 - uint32_t current_dispclk; 438 437 uint32_t dp_extclk; 439 438 uint32_t max_pixel_clock; 440 439 };
-1
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
··· 706 706 } 707 707 adev->clock.dp_extclk = 708 708 le16_to_cpu(firmware_info->info_21.usUniphyDPModeExtClkFreq); 709 - adev->clock.current_dispclk = adev->clock.default_dispclk; 710 709 711 710 adev->clock.max_pixel_clock = le16_to_cpu(firmware_info->info.usMaxPixelClock); 712 711 if (adev->clock.max_pixel_clock == 0)
-74
drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c
··· 27 27 #include "amdgpu_smu.h" 28 28 #include "amdgpu_dpm_internal.h" 29 29 30 - void amdgpu_dpm_get_active_displays(struct amdgpu_device *adev) 31 - { 32 - struct drm_device *ddev = adev_to_drm(adev); 33 - struct drm_crtc *crtc; 34 - struct amdgpu_crtc *amdgpu_crtc; 35 - 36 - adev->pm.dpm.new_active_crtcs = 0; 37 - adev->pm.dpm.new_active_crtc_count = 0; 38 - if (adev->mode_info.num_crtc && adev->mode_info.mode_config_initialized) { 39 - list_for_each_entry(crtc, 40 - &ddev->mode_config.crtc_list, head) { 41 - amdgpu_crtc = to_amdgpu_crtc(crtc); 42 - if (amdgpu_crtc->enabled) { 43 - adev->pm.dpm.new_active_crtcs |= (1 << amdgpu_crtc->crtc_id); 44 - adev->pm.dpm.new_active_crtc_count++; 45 - } 46 - } 47 - } 48 - } 49 - 50 - u32 amdgpu_dpm_get_vblank_time(struct amdgpu_device *adev) 51 - { 52 - struct drm_device *dev = adev_to_drm(adev); 53 - struct drm_crtc *crtc; 54 - struct amdgpu_crtc *amdgpu_crtc; 55 - u32 vblank_in_pixels; 56 - u32 vblank_time_us = 0xffffffff; /* if the displays are off, vblank time is max */ 57 - 58 - if (adev->mode_info.num_crtc && adev->mode_info.mode_config_initialized) { 59 - list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { 60 - amdgpu_crtc = to_amdgpu_crtc(crtc); 61 - if (crtc->enabled && amdgpu_crtc->enabled && amdgpu_crtc->hw_mode.clock) { 62 - vblank_in_pixels = 63 - amdgpu_crtc->hw_mode.crtc_htotal * 64 - (amdgpu_crtc->hw_mode.crtc_vblank_end - 65 - amdgpu_crtc->hw_mode.crtc_vdisplay + 66 - (amdgpu_crtc->v_border * 2)); 67 - 68 - vblank_time_us = vblank_in_pixels * 1000 / amdgpu_crtc->hw_mode.clock; 69 - 70 - /* we have issues with mclk switching with 71 - * refresh rates over 120 hz on the non-DC code. 72 - */ 73 - if (drm_mode_vrefresh(&amdgpu_crtc->hw_mode) > 120) 74 - vblank_time_us = 0; 75 - 76 - break; 77 - } 78 - } 79 - } 80 - 81 - return vblank_time_us; 82 - } 83 - 84 - u32 amdgpu_dpm_get_vrefresh(struct amdgpu_device *adev) 85 - { 86 - struct drm_device *dev = adev_to_drm(adev); 87 - struct drm_crtc *crtc; 88 - struct amdgpu_crtc *amdgpu_crtc; 89 - u32 vrefresh = 0; 90 - 91 - if (adev->mode_info.num_crtc && adev->mode_info.mode_config_initialized) { 92 - list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { 93 - amdgpu_crtc = to_amdgpu_crtc(crtc); 94 - if (crtc->enabled && amdgpu_crtc->enabled && amdgpu_crtc->hw_mode.clock) { 95 - vrefresh = drm_mode_vrefresh(&amdgpu_crtc->hw_mode); 96 - break; 97 - } 98 - } 99 - } 100 - 101 - return vrefresh; 102 - } 103 - 104 30 void amdgpu_dpm_get_display_cfg(struct amdgpu_device *adev) 105 31 { 106 32 struct drm_device *ddev = adev_to_drm(adev);
-4
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
··· 263 263 u32 voltage_response_time; 264 264 u32 backbias_response_time; 265 265 void *priv; 266 - u32 new_active_crtcs; 267 - int new_active_crtc_count; 268 - u32 current_active_crtcs; 269 - int current_active_crtc_count; 270 266 struct amdgpu_dpm_dynamic_state dyn_state; 271 267 struct amdgpu_dpm_fan fan; 272 268 u32 tdp_limit;
-6
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h
··· 23 23 #ifndef __AMDGPU_DPM_INTERNAL_H__ 24 24 #define __AMDGPU_DPM_INTERNAL_H__ 25 25 26 - void amdgpu_dpm_get_active_displays(struct amdgpu_device *adev); 27 - 28 - u32 amdgpu_dpm_get_vblank_time(struct amdgpu_device *adev); 29 - 30 - u32 amdgpu_dpm_get_vrefresh(struct amdgpu_device *adev); 31 - 32 26 void amdgpu_dpm_get_display_cfg(struct amdgpu_device *adev); 33 27 34 28 #endif
-3
drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c
··· 944 944 945 945 amdgpu_dpm_post_set_power_state(adev); 946 946 947 - adev->pm.dpm.current_active_crtcs = adev->pm.dpm.new_active_crtcs; 948 - adev->pm.dpm.current_active_crtc_count = adev->pm.dpm.new_active_crtc_count; 949 - 950 947 if (pp_funcs->force_performance_level) { 951 948 if (adev->pm.dpm.thermal_active) { 952 949 enum amd_dpm_forced_level level = adev->pm.dpm.forced_level;