| From 51954e17914aaadf18d97b21c2a2cee16fa29513 Mon Sep 17 00:00:00 2001 |
| From: Alex Deucher <alexander.deucher@amd.com> |
| Date: Tue, 13 Feb 2018 14:26:54 -0500 |
| Subject: drm/amd/powerplay/smu7: allow mclk switching with no displays |
| |
| From: Alex Deucher <alexander.deucher@amd.com> |
| |
| commit 51954e17914aaadf18d97b21c2a2cee16fa29513 upstream. |
| |
| If there are no displays attached, there is no reason to disable |
| mclk switching. |
| |
| Fixes mclks getting set to high when there are no displays attached. |
| |
| Reviewed-by: Eric Huang <JinhuiEric.Huang@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 11 +++++++---- |
| 1 file changed, 7 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c |
| +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c |
| @@ -2788,10 +2788,13 @@ static int smu7_apply_state_adjust_rules |
| PHM_PlatformCaps_DisableMclkSwitchingForFrameLock); |
| |
| |
| - disable_mclk_switching = ((1 < info.display_count) || |
| - disable_mclk_switching_for_frame_lock || |
| - smu7_vblank_too_short(hwmgr, mode_info.vblank_time_us) || |
| - (mode_info.refresh_rate > 120)); |
| + if (info.display_count == 0) |
| + disable_mclk_switching = false; |
| + else |
| + disable_mclk_switching = ((1 < info.display_count) || |
| + disable_mclk_switching_for_frame_lock || |
| + 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; |
