drm: omapdrm: Remove omap_plane enabled field

The field tracks the plane state to avoid double-enable or -disable.
This isn't required anymore, as

- the DRM atomic core guarantees that the plane atomic_update and
  atomic_disable functions will never be called on an enabled/disabled
  plane

- the CRTC enable/disable operations that enable/disable the plane are
  already guarded against double enable/disable

We can thus remove the enabled field completely. The
omap_plane_set_enable() function then becomes a wrapper around
omap_plane_setup() which can be called directly.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index e93ed34..82d03ed 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -452,19 +452,21 @@ static void omap_crtc_enable(struct drm_crtc *crtc)
 
        DBG("%s", omap_crtc->name);
 
+       dispc_runtime_get();
+
        /* Enable all planes associated with the CRTC. */
        for (i = 0; i < priv->num_planes; i++) {
                struct drm_plane *plane = priv->planes[i];
 
                if (plane->crtc == crtc)
-                       WARN_ON(omap_plane_set_enable(plane, true));
+                       WARN_ON(omap_plane_setup(plane));
        }
 
        omap_crtc_encoder_setup(crtc, true);
        omap_crtc_flush(crtc);
 
-       dispc_runtime_get();
        drm_crtc_vblank_on(crtc);
+
        dispc_runtime_put();
 }
 
@@ -479,18 +481,19 @@ static void omap_crtc_disable(struct drm_crtc *crtc)
        omap_crtc_wait_page_flip(crtc);
        dispc_runtime_get();
        drm_crtc_vblank_off(crtc);
-       dispc_runtime_put();
 
        /* Disable all planes associated with the CRTC. */
        for (i = 0; i < priv->num_planes; i++) {
                struct drm_plane *plane = priv->planes[i];
 
                if (plane->crtc == crtc)
-                       WARN_ON(omap_plane_set_enable(plane, false));
+                       WARN_ON(omap_plane_setup(plane));
        }
 
        omap_crtc_encoder_setup(crtc, false);
        omap_crtc_flush(crtc);
+
+       dispc_runtime_put();
 }
 
 static void omap_crtc_mode_set_nofb(struct drm_crtc *crtc)

diff --cc drivers/gpu/drm/omapdrm/omap_drv.h
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_plane.c
Simple merge