summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2017-08-17 16:36:51 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-30 10:26:36 +0200
commitdbe5b2d70cfdc3e1df1ceb3f715c6ef7d17fc566 (patch)
treebb55fd4f075be9aae02ca65d0759ec03fc435c20
parent4ac9a5daaf821781de8a16ab920132669f78195a (diff)
downloadlinux-stable-dbe5b2d70cfdc3e1df1ceb3f715c6ef7d17fc566.tar.gz
linux-stable-dbe5b2d70cfdc3e1df1ceb3f715c6ef7d17fc566.tar.bz2
linux-stable-dbe5b2d70cfdc3e1df1ceb3f715c6ef7d17fc566.zip
Revert "drm/amdgpu: fix vblank_time when displays are off"
This reverts commit 2dc1889ebf8501b0edf125e89a30e1cf3744a2a7. Fixes a suspend and resume regression. bug: https://bugzilla.kernel.org/show_bug.cgi?id=196615 Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index c0a806280257..f4a4efec8737 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -839,8 +839,6 @@ static int amdgpu_cgs_get_active_displays_info(struct cgs_device *cgs_device,
mode_info = info->mode_info;
if (mode_info) {
- /* if the displays are off, vblank time is max */
- mode_info->vblank_time_us = 0xffffffff;
/* always set the reference clock */
mode_info->ref_clock = adev->clock.spll.reference_freq;
}