drm/amdgpu/ci: disable mclk switching for high refresh rates (v2)
Subsystems (2)
PATCH 1/4 drm/amdgpu/ci: disable mclk switching for high refresh rates (v2)
Even if the vblank period would allow it, it still seems to be problematic on some cards.
v2: fix logic inversion (Nils)
--- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/amdgpu/ci_dpm.c +6 -0
@@ -906,6 +906,12 @@ static bool ci_dpm_vblank_too_short(struct amdgpu_device *adev)u32 vblank_time =amdgpu_dpm_get_vblank_time (adev);u32 switch_limit = adev->mc.vram_type ==AMDGPU_VRAM_TYPE_GDDR5 ?450 :300 ; +/* disable mclk switching if the refresh is >120Hz, even if the +* blanking period would allow it +*/ +if (amdgpu_dpm_get_vrefresh (adev) >120 ) +return true; +if (vblank_time < switch_limit)return true;else
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1495574797-11157-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 2/4 drm/radeon/ci: disable mclk switching for high refresh rates (v2)
Even if the vblank period would allow it, it still seems to be problematic on some cards.
v2: fix logic inversion (Nils)
--- drivers/gpu/drm/radeon/ci_dpm.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/radeon/ci_dpm.c +6 -0
@@ -776,6 +776,12 @@ bool ci_dpm_vblank_too_short(struct radeon_device *rdev)u32 vblank_time =r600_dpm_get_vblank_time (rdev);u32 switch_limit = pi->mem_gddr5 ?450 :300 ; +/* disable mclk switching if the refresh is >120Hz, even if the +* blanking period would allow it +*/ +if (r600_dpm_get_vrefresh (rdev) >120 ) +return true; +if (vblank_time < switch_limit)return true;else
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/4 drm/amd/powerplay/smu7: add vblank check for mclk switching (v2)
In reply to a message not in the archiveCheck to make sure the vblank period is long enough to support mclk switching.
v2: drop needless initial assignment (Nils)
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 31 +++++++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +27 -4
@@ -2655,6 +2655,28 @@ static int smu7_get_power_state_size(struct pp_hwmgr *hwmgr)return sizeof (struct smu7_power_state ); } +static int smu7_vblank_too_short (struct pp_hwmgr *hwmgr, +uint32_t vblank_time_us) +{ +struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend); +uint32_t switch_limit_us; + +switch (hwmgr->chip_id) { +case CHIP_POLARIS10 : +case CHIP_POLARIS11 : +case CHIP_POLARIS12 : + switch_limit_us = data->is_memory_gddr5 ?190 :150 ; +break ; +default : + switch_limit_us = data->is_memory_gddr5 ?450 :150 ; +break ; + } + +if (vblank_time_us < switch_limit_us) +return true; +else +return false; +} static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr, struct pp_power_state *request_ps,
@@ -2669,6 +2691,7 @@ static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr,bool disable_mclk_switching;bool disable_mclk_switching_for_frame_lock;struct cgs_display_info info = {0 }; +struct cgs_mode_info mode_info = {0 };const struct phm_clock_and_voltage_limits *max_limits;uint32_t i;struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);
@@ -2677,6 +2700,7 @@ static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr,int32_t count;int32_t stable_pstate_sclk =0 , stable_pstate_mclk =0 ; + info.mode_info = &mode_info; data->battery_state = (PP_StateUILabel_Battery == request_ps->classification.ui_label);
@@ -2703,8 +2727,6 @@ static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr,cgs_get_active_displays_info (hwmgr->device, &info); -/*TO DO result = PHM_CheckVBlankTime(hwmgr, &vblankTooShort);*/ - minimum_clocks.engineClock = hwmgr->display_config.min_core_set_clock; minimum_clocks.memoryClock = hwmgr->display_config.min_mem_set_clock;
@@ -2769,8 +2791,9 @@ static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr, PHM_PlatformCaps_DisableMclkSwitchingForFrameLock); - disable_mclk_switching = (1 < info.display_count) || - disable_mclk_switching_for_frame_lock; + disable_mclk_switching = ((1 < info.display_count) || + disable_mclk_switching_for_frame_lock || +smu7_vblank_too_short (hwmgr, mode_info.vblank_time_us)); sclk = smu7_ps->performance_levels[0 ].engine_clock; mclk = smu7_ps->performance_levels[0 ].memory_clock;
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1495574797-11157-3-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
RE: [PATCH 3/4] drm/amd/powerplay/smu7: add vblank check for mclk switching (v2)
+ if (vblank_time_us < switch_limit_us)
+ return true;
+ else
+ return false;
How about change the code to
return vblank_time_us < switch_limit_us ? true : false;
anyway, patch is reviewed-by: Rex Zhu <[email protected]>
Best Regards
Rex
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Alex Deucher
Sent: Wednesday, May 24, 2017 5:27 AM
To: [email protected]
Cc: Deucher, Alexander
Subject: [PATCH 3/4] drm/amd/powerplay/smu7: add vblank check for mclk switching (v2)
Check to make sure the vblank period is long enough to support mclk switching.
v2: drop needless initial assignment (Nils)
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 31 +++++++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +23 -0
@@ -2655,6 +2655,28 @@ static int smu7_get_power_state_size(struct pp_hwmgr *hwmgr)return sizeof (struct smu7_power_state ); } +static int smu7_vblank_too_short (struct pp_hwmgr *hwmgr, +uint32_t vblank_time_us) +{ +struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend); +uint32_t switch_limit_us; + +switch (hwmgr->chip_id) { +case CHIP_POLARIS10 : +case CHIP_POLARIS11 : +case CHIP_POLARIS12 : + switch_limit_us = data->is_memory_gddr5 ?190 :150 ; +break ; +default : + switch_limit_us = data->is_memory_gddr5 ?450 :150 ; +break ; + } + +if (vblank_time_us < switch_limit_us) +return true; +else +return false; +} static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr, struct pp_power_state *request_ps,
@@ -2669,6 +2691,7 @@ static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr,bool disable_mclk_switching;bool disable_mclk_switching_for_frame_lock;struct cgs_display_info info = {0 }; +struct cgs_mode_info mode_info = {0 };const struct phm_clock_and_voltage_limits *max_limits;uint32_t i; struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend); @@ -2677,6 +2700,7 @@ static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr,
int32_t count;
int32_t stable_pstate_sclk = 0, stable_pstate_mclk = 0;
+ info.mode_info = &mode_info;
data->battery_state = (PP_StateUILabel_Battery ==
request_ps->classification.ui_label);
@@ -2703,8 +2727,6 @@ static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr,
cgs_get_active_displays_info(hwmgr->device, &info);
- /*TO DO result = PHM_CheckVBlankTime(hwmgr, &vblankTooShort);*/
-
minimum_clocks.engineClock = hwmgr->display_config.min_core_set_clock; minimum_clocks.memoryClock = hwmgr->display_config.min_mem_set_clock;
@@ -2769,8 +2791,9 @@ static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr,
PHM_PlatformCaps_DisableMclkSwitchingForFrameLock);
- disable_mclk_switching = (1 < info.display_count) ||
- disable_mclk_switching_for_frame_lock;
+ disable_mclk_switching = ((1 < info.display_count) ||
+ disable_mclk_switching_for_frame_lock ||
+ smu7_vblank_too_short(hwmgr, mode_info.vblank_time_us));
sclk = smu7_ps->performance_levels[0].engine_clock; mclk = smu7_ps->performance_levels[0].memory_clock;
--
2.5.5
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/4 drm/amd/powerplay/smu7: disable mclk switching for high refresh rates
In reply to a message not in the archiveEven if the vblank period would allow it, it still seems to be problematic on some cards.
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +2 -1
@@ -2793,7 +2793,8 @@ static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr, disable_mclk_switching = ((1 < info.display_count) || disable_mclk_switching_for_frame_lock || -smu7_vblank_too_short (hwmgr, mode_info.vblank_time_us)); +smu7_vblank_too_short (hwmgr, mode_info.vblank_time_us) || + (mode_info.refresh_rate >120 )); sclk = smu7_ps->performance_levels[0 ].engine_clock; mclk = smu7_ps->performance_levels[0 ].memory_clock;
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1495574797-11157-4-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
RE: [PATCH 4/4] drm/amd/powerplay/smu7: disable mclk switching for high refresh rates
We met similar issue on CI(SWDEV-103046). In high refresh rate, Dal need to notify powerpaly the min_mclk.
Best Regards
Rex
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Alex Deucher
Sent: Wednesday, May 24, 2017 5:27 AM
To: [email protected]
Cc: Deucher, Alexander
Subject: [PATCH 4/4] drm/amd/powerplay/smu7: disable mclk switching for high refresh rates
Even if the vblank period would allow it, it still seems to be problematic on some cards.
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +2 -1
@@ -2793,7 +2793,8 @@ static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr, disable_mclk_switching = ((1 < info.display_count) || disable_mclk_switching_for_frame_lock || -smu7_vblank_too_short (hwmgr, mode_info.vblank_time_us)); +smu7_vblank_too_short (hwmgr, mode_info.vblank_time_us) || + (mode_info.refresh_rate >120 )); sclk = smu7_ps->performance_levels[0 ].engine_clock; mclk = smu7_ps->performance_levels[0 ].memory_clock;
--
2.5.5
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Christian König
Acked-byAm 23.05.2017 um 23:26 schrieb Alex Deucher:
Quoted 8 lines
Even if the vblank period would allow it, it still seems to be problematic on some cards.
v2: fix logic inversion (Nils)
Signed-off-by Alex Deucher <[email protected]>
Quoted 11 lines
--- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/gpu/drm/amd/amdgpu/ci_dpm.c +0
-0@@ -906,6 +906,12 @@ static bool ci_dpm_vblank_too_short(struct amdgpu_device *adev)u32 vblank_time =amdgpu_dpm_get_vblank_time (adev);u32 switch_limit = adev->mc.vram_type ==AMDGPU_VRAM_TYPE_GDDR5 ?450 :300 ;
drivers/gpu/drm/amd/amdgpu/ci_dpm.c static bool ci_dpm_vblank_too_short(struct amdgpu_device *adev) · line 917
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/ci_dpm.c +6
-0+/* disable mclk switching if the refresh is >120Hz, even if the +* blanking period would allow it +*/ +if (amdgpu_dpm_get_vrefresh (adev) >120 ) +return true; +if (vblank_time < switch_limit)return true;else
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx