drm/atomic: Use active instead of enable in wait_for_vblanks.
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Thu, 8 Dec 2016 13:45:24 +0000 (14:45 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 8 Dec 2016 15:37:06 +0000 (16:37 +0100)
When DPMS was introduced to atomic, vblanks only worked when the crtc
was enabled and active. wait_for_vblanks were not converted to check for
crtc_state->active, which may cause an attempt for vblank_get to fail.

This is probably harmless, but convert from enable to active anyway.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1481204729-9058-2-git-send-email-maarten.lankhorst@linux.intel.com
drivers/gpu/drm/drm_atomic_helper.c

index 583f47f27b36de20a7ec1e273ce02559aa3fdae0..23767df72615468e7740efb0ae7910d9207fd4ca 100644 (file)
@@ -1117,7 +1117,7 @@ drm_atomic_helper_wait_for_vblanks(struct drm_device *dev,
                 * vblank wait) in the ->enable boolean. */
                old_crtc_state->enable = false;
 
-               if (!crtc->state->enable)
+               if (!crtc->state->active)
                        continue;
 
                /* Legacy cursor ioctls are completely unsynced, and userspace