diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-12-08 14:45:24 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-12-08 16:37:06 +0100 |
| commit | 7da0e124af76c79927f0d7abcc58d58d0fd7072f (patch) | |
| tree | fbc371afb2a808ed695632c73d901670ed6d0b1d | |
| parent | d82faafd81fe1cf2a11cbc94b05d9fd22e651d49 (diff) | |
| download | linux-7da0e124af76c79927f0d7abcc58d58d0fd7072f.tar.gz linux-7da0e124af76c79927f0d7abcc58d58d0fd7072f.tar.bz2 linux-7da0e124af76c79927f0d7abcc58d58d0fd7072f.zip | |
drm/atomic: Use active instead of enable in wait_for_vblanks.
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
| -rw-r--r-- | drivers/gpu/drm/drm_atomic_helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 583f47f27b36..23767df72615 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -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 |