From: Alex Deucher <alexdeucher@gmail.com>
Date: Thu, 17 Aug 2017 16:36:51 -0400
Subject: [PATCH] Revert "drm/amdgpu: fix vblank_time when displays are off"
References: bnc#1060662
Patch-mainline: 4.12.10
Git-commit: dbe5b2d70cfdc3e1df1ceb3f715c6ef7d17fc566
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 2 --
1 file changed, 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;
}
--
2.14.2