[v2,10/20] drm: omapdrm: Only commit planes on active CRTCs

Commit Message

Laurent Pinchart June 6, 2016, 11:42 p.m. UTC

The DRM core supports skipping plane update for inactive CRTCs for
hardware that don't need it or can't cope with it. That's our case, so
use the DRM core infrastructure instead of reinventing it.

Signed-off-by: Laurent Pinchart <[e-mail]>
---
 drivers/gpu/drm/omapdrm/omap_crtc.c | 6 ++++--
 drivers/gpu/drm/omapdrm/omap_drv.c  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

Patch

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index 4c56d6a68390..37b5f7096c6e 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -384,9 +384,11 @@  static void omap_crtc_atomic_flush(struct drm_crtc *crtc,
 	/*
 	 * Only flush the CRTC if it is currently active. CRTCs that require a
 	 * mode set are disabled prior plane updates and enabled afterwards.
-	 * They are thus not active, regardless of what their state report.
+	 * They are thus not active, regardless of what their state report, and
+	 * the DRM core could thus call this function even though the CRTC is
+	 * currently disabled. Do nothing in that case.
 	 */
-	if (!crtc->state->active || drm_atomic_crtc_needs_modeset(crtc->state))
+	if (drm_atomic_crtc_needs_modeset(crtc->state))
 		return;
 
 	DBG("%s: GO", omap_crtc->name);
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 65f280f5d947..70c5f24e67f7 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -96,7 +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, false);
+	drm_atomic_helper_commit_planes(dev, old_state, true);
 	drm_atomic_helper_commit_modeset_enables(dev, old_state);
 
 	omap_atomic_wait_for_completion(dev, old_state);