4.12-stable review patch. If anyone has any objections, please let me know.
------------------ From: Alex Deucher <[email protected]> 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 <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 2 -- 1 file changed, 2 deletions(-) --- 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_display 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; }
