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 <[email protected]>
Cc: Tomi Valkeinen <[email protected]>
Reviewed-by: Daniel Vetter <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index ce3341d61a1203d101257dfda4ad681d895fc6cd..721a358531b01325da29033f35da12c317d6cb48 100644 (file)
--- 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)
 static void omap_atomic_wait_for_completion(struct drm_device *dev,
                                            struct drm_atomic_state *old_state)
 {
-       struct drm_crtc_state *old_crtc_state;
+       struct drm_crtc_state *new_crtc_state;
        struct drm_crtc *crtc;
        unsigned int i;
        int ret;
 
-       for_each_crtc_in_state(old_state, crtc, old_crtc_state, i) {
-               if (!crtc->state->enable)
+       for_each_new_crtc_in_state(old_state, crtc, new_crtc_state, i) {
+               if (!new_crtc_state->active)
                        continue;
 
                ret = omap_crtc_wait_pending(crtc);