diff options
author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-07-19 10:39:17 -0400 |
---|---|---|
committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-08-01 05:07:36 -0400 |
commit | 34d88237388bb6d7b8258e6ba4e71e4d1be32d02 (patch) | |
tree | 4cd5393a470dc0063888eaa8e31b7e0e99015a72 /drivers/gpu/drm/omapdrm/omap_drv.c | |
parent | b20adb9188f10874af2890eebec8862b91c71c5c (diff) |
drm/omapdrm: Fix omap_atomic_wait_for_completion
Use the new iterator macro and look for crtc_state->active instead of
enable, only crtc_state->active implies that vblanks will happen.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20170719143920.25685-5-maarten.lankhorst@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_drv.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_drv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index ce3341d61a12..721a358531b0 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c | |||
@@ -57,13 +57,13 @@ static void omap_fb_output_poll_changed(struct drm_device *dev) | |||
57 | static void omap_atomic_wait_for_completion(struct drm_device *dev, | 57 | static void omap_atomic_wait_for_completion(struct drm_device *dev, |
58 | struct drm_atomic_state *old_state) | 58 | struct drm_atomic_state *old_state) |
59 | { | 59 | { |
60 | struct drm_crtc_state *old_crtc_state; | 60 | struct drm_crtc_state *new_crtc_state; |
61 | struct drm_crtc *crtc; | 61 | struct drm_crtc *crtc; |
62 | unsigned int i; | 62 | unsigned int i; |
63 | int ret; | 63 | int ret; |
64 | 64 | ||
65 | for_each_crtc_in_state(old_state, crtc, old_crtc_state, i) { | 65 | for_each_new_crtc_in_state(old_state, crtc, new_crtc_state, i) { |
66 | if (!crtc->state->enable) | 66 | if (!new_crtc_state->active) |
67 | continue; | 67 | continue; |
68 | 68 | ||
69 | ret = omap_crtc_wait_pending(crtc); | 69 | ret = omap_crtc_wait_pending(crtc); |