From: Maarten Lankhorst Date: Wed, 19 Jul 2017 14:39:17 +0000 (+0200) Subject: drm/omapdrm: Fix omap_atomic_wait_for_completion X-Git-Tag: MMI-PSA29.97-13-9~4697^2~32^2~48 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=34d88237388bb6d7b8258e6ba4e71e4d1be32d02;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Cc: Tomi Valkeinen Reviewed-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20170719143920.25685-5-maarten.lankhorst@linux.intel.com --- 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) 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);