]> git.hungrycats.org Git - linux/commitdiff
Revert "drm/amdgpu: fix vblank_time when displays are off"
authorAlex Deucher <alexdeucher@gmail.com>
Thu, 17 Aug 2017 20:36:51 +0000 (16:36 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Aug 2017 08:26:36 +0000 (10:26 +0200)
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>
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c

index c0a806280257c80954930c3744d7cd65e6b6de5f..f4a4efec8737bb1899c8793560a53af4e6389992 100644 (file)
@@ -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;
        }