drm: omapdrm: dispc: Pass DISPC pointer to dispc_ops operations

This removes the need to access the global DISPC private data in those
functions (both for the current accesses and the future ones that will
be introduced when allocating the DISPC private data dynamically).

In order to allow the omapdrm side to call the dispc_ops with a DISPC
pointer, we also introduce a new function dss_get_dispc() to retrieve
the DISPC corresponding to the DSS.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
index 0665ed9fe395..2899435cad6e 100644
--- a/drivers/gpu/drm/omapdrm/omap_plane.c
+++ b/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -77,17 +77,17 @@ static void omap_plane_atomic_update(struct drm_plane *plane,
                         &info.paddr, &info.p_uv_addr);
 
         /* and finally, update omapdss: */
-        ret = priv->dispc_ops->ovl_setup(omap_plane->id, &info,
+        ret = priv->dispc_ops->ovl_setup(priv->dispc, omap_plane->id, &info,
                               omap_crtc_timings(state->crtc), false,
                               omap_crtc_channel(state->crtc));
         if (ret) {
                 dev_err(plane->dev->dev, "Failed to setup plane %s\n",
                         omap_plane->name);
-                priv->dispc_ops->ovl_enable(omap_plane->id, false);
+                priv->dispc_ops->ovl_enable(priv->dispc, omap_plane->id, false);
                 return;
         }
 
-        priv->dispc_ops->ovl_enable(omap_plane->id, true);
+        priv->dispc_ops->ovl_enable(priv->dispc, omap_plane->id, true);
 }
 
 static void omap_plane_atomic_disable(struct drm_plane *plane,
@@ -100,7 +100,7 @@ static void omap_plane_atomic_disable(struct drm_plane *plane,
         plane->state->zpos = plane->type == DRM_PLANE_TYPE_PRIMARY
                            ? 0 : omap_plane->id;
 
-        priv->dispc_ops->ovl_enable(omap_plane->id, false);
+        priv->dispc_ops->ovl_enable(priv->dispc, omap_plane->id, false);
 }
 
 static int omap_plane_atomic_check(struct drm_plane *plane,
@@ -259,7 +259,7 @@ struct drm_plane *omap_plane_init(struct drm_device *dev,
                 u32 possible_crtcs)
 {
         struct omap_drm_private *priv = dev->dev_private;
-        unsigned int num_planes = priv->dispc_ops->get_num_ovls();
+        unsigned int num_planes = priv->dispc_ops->get_num_ovls(priv->dispc);
         struct drm_plane *plane;
         struct omap_plane *omap_plane;
         enum omap_plane_id id;
@@ -278,7 +278,7 @@ struct drm_plane *omap_plane_init(struct drm_device *dev,
         if (!omap_plane)
                 return ERR_PTR(-ENOMEM);
 
-        formats = priv->dispc_ops->ovl_get_color_modes(id);
+        formats = priv->dispc_ops->ovl_get_color_modes(priv->dispc, id);
         for (nformats = 0; formats[nformats]; ++nformats)
                 ;
         omap_plane->id = id;