2 files changed, 2 insertions, 9 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index dd47dc191e6b..b68c70eb395f 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -410,13 +410,7 @@ static void omap_crtc_atomic_flush(struct drm_crtc *crtc,
                 dispc_mgr_set_gamma(omap_crtc->channel, lut, length);
         }
 
-        /*
-         * Only flush the CRTC if it is currently enabled. CRTCs that require a
-         * mode set are disabled prior plane updates and enabled afterwards.
-         * They are thus not active (regardless of what their CRTC core state
-         * reports) and the DRM core could thus call this function even though
-         * the CRTC is currently disabled. Do nothing in that case.
-         */
+        /* Only flush the CRTC if it is currently enabled. */
         if (!omap_crtc->enabled)
                 return;
 
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index afe8f05b927b..f85c9c8d8467 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -96,8 +96,7 @@ static void omap_atomic_complete(struct omap_atomic_state_commit *commit)
         dispc_runtime_get();
 
         drm_atomic_helper_commit_modeset_disables(dev, old_state);
-        drm_atomic_helper_commit_planes(dev, old_state,
-                                        DRM_PLANE_COMMIT_ACTIVE_ONLY);
+        drm_atomic_helper_commit_planes(dev, old_state, 0);
         drm_atomic_helper_commit_modeset_enables(dev, old_state);
 
         omap_atomic_wait_for_completion(dev, old_state);