summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher2017-06-29 22:08:49 +0200
committerAlex Deucher2017-06-30 15:53:50 +0200
commitbeb3777682d5c296cc15a2a424f5a7a98476def0 (patch)
tree3613fc89bf40965f6539eee5f231512c3270e120
parentdrm/amd/powerplay: power value format change for Vega10 (diff)
downloadkernel-qcow2-linux-beb3777682d5c296cc15a2a424f5a7a98476def0.tar.gz
kernel-qcow2-linux-beb3777682d5c296cc15a2a424f5a7a98476def0.tar.xz
kernel-qcow2-linux-beb3777682d5c296cc15a2a424f5a7a98476def0.zip
drm/amdgpu: fix vblank_time when displays are off
If the displays are off, set the vblank time to max to make sure mclk switching is enabled. Avoid mclk getting set to high when no displays are attached. bug: https://bugs.freedesktop.org/show_bug.cgi?id=101528 fixes: 09be4a5219 (drm/amd/powerplay/smu7: add vblank check for mclk switching (v2)) Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index c6dba1eaefbd..8b8eda7d1703 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -838,6 +838,9 @@ static int amdgpu_cgs_get_active_displays_info(struct cgs_device *cgs_device,
return -EINVAL;
mode_info = info->mode_info;
+ if (mode_info)
+ /* if the displays are off, vblank time is max */
+ mode_info->vblank_time_us = 0xffffffff;
if (adev->mode_info.num_crtc && adev->mode_info.mode_config_initialized) {
list_for_each_entry(crtc,