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, 19 insertions, 12 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index ffe4f698d291..6c4d40b824e4 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -117,10 +117,13 @@ static int omap_crtc_dss_connect(struct omap_drm_private *priv,
                 enum omap_channel channel,
                 struct omap_dss_device *dst)
 {
+        const struct dispc_ops *dispc_ops = priv->dispc_ops;
+        struct dispc_device *dispc = priv->dispc;
+
         if (omap_crtc_output[channel])
                 return -EINVAL;
 
-        if (!(priv->dispc_ops->mgr_get_supported_outputs(channel) & dst->id))
+        if (!(dispc_ops->mgr_get_supported_outputs(dispc, channel) & dst->id))
                 return -EINVAL;
 
         omap_crtc_output[channel] = dst;
@@ -157,7 +160,7 @@ static void omap_crtc_set_enabled(struct drm_crtc *crtc, bool enable)
                 return;
 
         if (omap_crtc_output[channel]->output_type == OMAP_DISPLAY_TYPE_HDMI) {
-                priv->dispc_ops->mgr_enable(channel, enable);
+                priv->dispc_ops->mgr_enable(priv->dispc, channel, enable);
                 omap_crtc->enabled = enable;
                 return;
         }
@@ -170,8 +173,9 @@ static void omap_crtc_set_enabled(struct drm_crtc *crtc, bool enable)
                 omap_crtc->ignore_digit_sync_lost = true;
         }
 
-        framedone_irq = priv->dispc_ops->mgr_get_framedone_irq(channel);
-        vsync_irq = priv->dispc_ops->mgr_get_vsync_irq(channel);
+        framedone_irq = priv->dispc_ops->mgr_get_framedone_irq(priv->dispc,
+                                                               channel);
+        vsync_irq = priv->dispc_ops->mgr_get_vsync_irq(priv->dispc, channel);
 
         if (enable) {
                 wait = omap_irq_wait_init(dev, vsync_irq, 1);
@@ -191,7 +195,7 @@ static void omap_crtc_set_enabled(struct drm_crtc *crtc, bool enable)
                         wait = omap_irq_wait_init(dev, vsync_irq, 2);
         }
 
-        priv->dispc_ops->mgr_enable(channel, enable);
+        priv->dispc_ops->mgr_enable(priv->dispc, channel, enable);
         omap_crtc->enabled = enable;
 
         ret = omap_irq_wait(dev, wait, msecs_to_jiffies(100));
@@ -213,7 +217,8 @@ static int omap_crtc_dss_enable(struct omap_drm_private *priv,
 {
         struct omap_crtc *omap_crtc = omap_crtcs[channel];
 
-        priv->dispc_ops->mgr_set_timings(omap_crtc->channel, &omap_crtc->vm);
+        priv->dispc_ops->mgr_set_timings(priv->dispc, omap_crtc->channel,
+                                         &omap_crtc->vm);
         omap_crtc_set_enabled(&omap_crtc->base, true);
 
         return 0;
@@ -243,7 +248,8 @@ static void omap_crtc_dss_set_lcd_config(struct omap_drm_private *priv,
         struct omap_crtc *omap_crtc = omap_crtcs[channel];
 
         DBG("%s", omap_crtc->name);
-        priv->dispc_ops->mgr_set_lcd_config(omap_crtc->channel, config);
+        priv->dispc_ops->mgr_set_lcd_config(priv->dispc, omap_crtc->channel,
+                                            config);
 }
 
 static int omap_crtc_dss_register_framedone(
@@ -300,7 +306,7 @@ void omap_crtc_vblank_irq(struct drm_crtc *crtc)
          * If the dispc is busy we're racing the flush operation. Try again on
          * the next vblank interrupt.
          */
-        if (priv->dispc_ops->mgr_go_busy(omap_crtc->channel)) {
+        if (priv->dispc_ops->mgr_go_busy(priv->dispc, omap_crtc->channel)) {
                 spin_unlock(&crtc->dev->event_lock);
                 return;
         }
@@ -337,7 +343,7 @@ static void omap_crtc_write_crtc_properties(struct drm_crtc *crtc)
         info.partial_alpha_enabled = false;
         info.cpr_enable = false;
 
-        priv->dispc_ops->mgr_setup(omap_crtc->channel, &info);
+        priv->dispc_ops->mgr_setup(priv->dispc, omap_crtc->channel, &info);
 }
 
 /* -----------------------------------------------------------------------------
@@ -537,7 +543,8 @@ static void omap_crtc_atomic_flush(struct drm_crtc *crtc,
                         length = crtc->state->gamma_lut->length /
                                 sizeof(*lut);
                 }
-                priv->dispc_ops->mgr_set_gamma(omap_crtc->channel, lut, length);
+                priv->dispc_ops->mgr_set_gamma(priv->dispc, omap_crtc->channel,
+                                               lut, length);
         }
 
         omap_crtc_write_crtc_properties(crtc);
@@ -552,7 +559,7 @@ static void omap_crtc_atomic_flush(struct drm_crtc *crtc,
         WARN_ON(ret != 0);
 
         spin_lock_irq(&crtc->dev->event_lock);
-        priv->dispc_ops->mgr_go(omap_crtc->channel);
+        priv->dispc_ops->mgr_go(priv->dispc, omap_crtc->channel);
         omap_crtc_arm_event(crtc);
         spin_unlock_irq(&crtc->dev->event_lock);
 }
@@ -734,7 +741,7 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,
          * extracted with dispc_mgr_gamma_size(). If it returns 0
          * gamma table is not supprted.
          */
-        if (priv->dispc_ops->mgr_gamma_size(channel)) {
+        if (priv->dispc_ops->mgr_gamma_size(priv->dispc, channel)) {
                 unsigned int gamma_lut_size = 256;
 
                 drm_crtc_enable_color_mgmt(crtc, 0, false, gamma_lut_size);