drm/omap: remove dss_mgr_ops

dss_mgr_ops was needed with the multi-module architecture, but is no
longer needed. We can thus remove it and use direct calls.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201215104657.802264-55-tomi.valkeinen@ti.com

diff --git a/drivers/gpu/drm/omapdrm/dss/dss.h b/drivers/gpu/drm/omapdrm/dss/dss.h
index 96f702314c8cca1592c29c9ce04cfb66b8d32587..a547527bb2f3bf7ac59a691c0b9c1d95085dc7fc 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dss.h
+++ b/drivers/gpu/drm/omapdrm/dss/dss.h
@@ -257,7 +257,6 @@ struct dss_device {
        struct dss_pll  *video2_pll;
 
        struct dispc_device *dispc;
-       const struct dss_mgr_ops *mgr_ops;
        struct omap_drm_private *mgr_ops_priv;
 };
 

diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 8b2a9af339a179342d2b1386db21873c5d6227a0..30c9e1c189c1dde41a1371abe688cd3c8bd1bc37 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -341,31 +341,23 @@ enum dss_writeback_channel {
        DSS_WB_LCD3_MGR =       7,
 };
 
-struct dss_mgr_ops {
-       void (*start_update)(struct omap_drm_private *priv,
-                            enum omap_channel channel);
-       int (*enable)(struct omap_drm_private *priv,
-                     enum omap_channel channel);
-       void (*disable)(struct omap_drm_private *priv,
-                       enum omap_channel channel);
-       void (*set_timings)(struct omap_drm_private *priv,
-                           enum omap_channel channel,
-                           const struct videomode *vm);
-       void (*set_lcd_config)(struct omap_drm_private *priv,
-                              enum omap_channel channel,
-                              const struct dss_lcd_mgr_config *config);
-       int (*register_framedone_handler)(struct omap_drm_private *priv,
-                       enum omap_channel channel,
-                       void (*handler)(void *), void *data);
-       void (*unregister_framedone_handler)(struct omap_drm_private *priv,
-                       enum omap_channel channel,
-                       void (*handler)(void *), void *data);
-};
-
-int dss_install_mgr_ops(struct dss_device *dss,
-                       const struct dss_mgr_ops *mgr_ops,
-                       struct omap_drm_private *priv);
-void dss_uninstall_mgr_ops(struct dss_device *dss);
+void omap_crtc_dss_start_update(struct omap_drm_private *priv,
+                                      enum omap_channel channel);
+void omap_crtc_set_enabled(struct drm_crtc *crtc, bool enable);
+int omap_crtc_dss_enable(struct omap_drm_private *priv, enum omap_channel channel);
+void omap_crtc_dss_disable(struct omap_drm_private *priv, enum omap_channel channel);
+void omap_crtc_dss_set_timings(struct omap_drm_private *priv,
+               enum omap_channel channel,
+               const struct videomode *vm);
+void omap_crtc_dss_set_lcd_config(struct omap_drm_private *priv,
+               enum omap_channel channel,
+               const struct dss_lcd_mgr_config *config);
+int omap_crtc_dss_register_framedone(
+               struct omap_drm_private *priv, enum omap_channel channel,
+               void (*handler)(void *), void *data);
+void omap_crtc_dss_unregister_framedone(
+               struct omap_drm_private *priv, enum omap_channel channel,
+               void (*handler)(void *), void *data);
 
 void dss_mgr_set_timings(struct omap_dss_device *dssdev,
                const struct videomode *vm);

diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c
index cd1cfcb2abd0d400b382a0fd7566ade9cf4e0fbb..7378e855c278c3809bc431ff48a1c5a41b7dedfc 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -81,54 +81,35 @@ void omapdss_device_cleanup_output(struct omap_dss_device *out)
                                        out->next_bridge : out->bridge);
 }
 
-int dss_install_mgr_ops(struct dss_device *dss,
-                       const struct dss_mgr_ops *mgr_ops,
-                       struct omap_drm_private *priv)
-{
-       if (dss->mgr_ops)
-               return -EBUSY;
-
-       dss->mgr_ops = mgr_ops;
-       dss->mgr_ops_priv = priv;
-
-       return 0;
-}
-
-void dss_uninstall_mgr_ops(struct dss_device *dss)
-{
-       dss->mgr_ops = NULL;
-       dss->mgr_ops_priv = NULL;
-}
-
 void dss_mgr_set_timings(struct omap_dss_device *dssdev,
                         const struct videomode *vm)
 {
-       dssdev->dss->mgr_ops->set_timings(dssdev->dss->mgr_ops_priv,
+       omap_crtc_dss_set_timings(dssdev->dss->mgr_ops_priv,
                                          dssdev->dispc_channel, vm);
 }
 
 void dss_mgr_set_lcd_config(struct omap_dss_device *dssdev,
                const struct dss_lcd_mgr_config *config)
 {
-       dssdev->dss->mgr_ops->set_lcd_config(dssdev->dss->mgr_ops_priv,
+       omap_crtc_dss_set_lcd_config(dssdev->dss->mgr_ops_priv,
                                             dssdev->dispc_channel, config);
 }
 
 int dss_mgr_enable(struct omap_dss_device *dssdev)
 {
-       return dssdev->dss->mgr_ops->enable(dssdev->dss->mgr_ops_priv,
+       return omap_crtc_dss_enable(dssdev->dss->mgr_ops_priv,
                                            dssdev->dispc_channel);
 }
 
 void dss_mgr_disable(struct omap_dss_device *dssdev)
 {
-       dssdev->dss->mgr_ops->disable(dssdev->dss->mgr_ops_priv,
+       omap_crtc_dss_disable(dssdev->dss->mgr_ops_priv,
                                      dssdev->dispc_channel);
 }
 
 void dss_mgr_start_update(struct omap_dss_device *dssdev)
 {
-       dssdev->dss->mgr_ops->start_update(dssdev->dss->mgr_ops_priv,
+       omap_crtc_dss_start_update(dssdev->dss->mgr_ops_priv,
                                           dssdev->dispc_channel);
 }
 
@@ -137,7 +118,7 @@ int dss_mgr_register_framedone_handler(struct omap_dss_device *dssdev,
 {
        struct dss_device *dss = dssdev->dss;
 
-       return dss->mgr_ops->register_framedone_handler(dss->mgr_ops_priv,
+       return omap_crtc_dss_register_framedone(dss->mgr_ops_priv,
                                                        dssdev->dispc_channel,
                                                        handler, data);
 }
@@ -147,7 +128,7 @@ void dss_mgr_unregister_framedone_handler(struct omap_dss_device *dssdev,
 {
        struct dss_device *dss = dssdev->dss;
 
-       dss->mgr_ops->unregister_framedone_handler(dss->mgr_ops_priv,
+       omap_crtc_dss_unregister_framedone(dss->mgr_ops_priv,
                                                   dssdev->dispc_channel,
                                                   handler, data);
 }

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index 04041d7cb07ea72b4058a0e74c3658ee374dc7e2..06a719c104f4e492a7b58f7b71bf7e09e0183479 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -100,14 +100,14 @@ int omap_crtc_wait_pending(struct drm_crtc *crtc)
  * the upstream part of the video pipe.
  */
 
-static void omap_crtc_dss_start_update(struct omap_drm_private *priv,
+void omap_crtc_dss_start_update(struct omap_drm_private *priv,
                                       enum omap_channel channel)
 {
        dispc_mgr_enable(priv->dispc, channel, true);
 }
 
 /* Called only from the encoder enable/disable and suspend/resume handlers. */
-static void omap_crtc_set_enabled(struct drm_crtc *crtc, bool enable)
+void omap_crtc_set_enabled(struct drm_crtc *crtc, bool enable)
 {
        struct omap_crtc_state *omap_state = to_omap_crtc_state(crtc->state);
        struct drm_device *dev = crtc->dev;
@@ -180,8 +180,7 @@ static void omap_crtc_set_enabled(struct drm_crtc *crtc, bool enable)
 }
 
 
-static int omap_crtc_dss_enable(struct omap_drm_private *priv,
-                               enum omap_channel channel)
+int omap_crtc_dss_enable(struct omap_drm_private *priv, enum omap_channel channel)
 {
        struct drm_crtc *crtc = priv->channels[channel]->crtc;
        struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
@@ -193,8 +192,7 @@ static int omap_crtc_dss_enable(struct omap_drm_private *priv,
        return 0;
 }
 
-static void omap_crtc_dss_disable(struct omap_drm_private *priv,
-                                 enum omap_channel channel)
+void omap_crtc_dss_disable(struct omap_drm_private *priv, enum omap_channel channel)
 {
        struct drm_crtc *crtc = priv->channels[channel]->crtc;
        struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
@@ -202,7 +200,7 @@ static void omap_crtc_dss_disable(struct omap_drm_private *priv,
        omap_crtc_set_enabled(&omap_crtc->base, false);
 }
 
-static void omap_crtc_dss_set_timings(struct omap_drm_private *priv,
+void omap_crtc_dss_set_timings(struct omap_drm_private *priv,
                enum omap_channel channel,
                const struct videomode *vm)
 {
@@ -213,7 +211,7 @@ static void omap_crtc_dss_set_timings(struct omap_drm_private *priv,
        omap_crtc->vm = *vm;
 }
 
-static void omap_crtc_dss_set_lcd_config(struct omap_drm_private *priv,
+void omap_crtc_dss_set_lcd_config(struct omap_drm_private *priv,
                enum omap_channel channel,
                const struct dss_lcd_mgr_config *config)
 {
@@ -225,7 +223,7 @@ static void omap_crtc_dss_set_lcd_config(struct omap_drm_private *priv,
                                            config);
 }
 
-static int omap_crtc_dss_register_framedone(
+int omap_crtc_dss_register_framedone(
                struct omap_drm_private *priv, enum omap_channel channel,
                void (*handler)(void *), void *data)
 {
@@ -244,7 +242,7 @@ static int omap_crtc_dss_register_framedone(
        return 0;
 }
 
-static void omap_crtc_dss_unregister_framedone(
+void omap_crtc_dss_unregister_framedone(
                struct omap_drm_private *priv, enum omap_channel channel,
                void (*handler)(void *), void *data)
 {
@@ -261,16 +259,6 @@ static void omap_crtc_dss_unregister_framedone(
        omap_crtc->framedone_handler_data = NULL;
 }
 
-static const struct dss_mgr_ops mgr_ops = {
-       .start_update = omap_crtc_dss_start_update,
-       .enable = omap_crtc_dss_enable,
-       .disable = omap_crtc_dss_disable,
-       .set_timings = omap_crtc_dss_set_timings,
-       .set_lcd_config = omap_crtc_dss_set_lcd_config,
-       .register_framedone_handler = omap_crtc_dss_register_framedone,
-       .unregister_framedone_handler = omap_crtc_dss_unregister_framedone,
-};
-
 /* -----------------------------------------------------------------------------
  * Setup, Flush and Page Flip
  */
@@ -790,16 +778,6 @@ static const char *channel_names[] = {
        [OMAP_DSS_CHANNEL_LCD3] = "lcd3",
 };
 
-void omap_crtc_pre_init(struct omap_drm_private *priv)
-{
-       dss_install_mgr_ops(priv->dss, &mgr_ops, priv);
-}
-
-void omap_crtc_pre_uninit(struct omap_drm_private *priv)
-{
-       dss_uninstall_mgr_ops(priv->dss);
-}
-
 /* initialize crtc */
 struct drm_crtc *omap_crtc_init(struct drm_device *dev,
                                struct omap_drm_pipeline *pipe,

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.h b/drivers/gpu/drm/omapdrm/omap_crtc.h
index 2fd57751ae2b16f52812f232c540ce9a9cd82466..a8b9cbee86e07c6eab1b6b8889b73a8013e448e7 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_crtc.h
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.h
@@ -22,8 +22,6 @@ struct videomode;
 
 struct videomode *omap_crtc_timings(struct drm_crtc *crtc);
 enum omap_channel omap_crtc_channel(struct drm_crtc *crtc);
-void omap_crtc_pre_init(struct omap_drm_private *priv);
-void omap_crtc_pre_uninit(struct omap_drm_private *priv);
 struct drm_crtc *omap_crtc_init(struct drm_device *dev,
                                struct omap_drm_pipeline *pipe,
                                struct drm_plane *plane);

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 2f2ead897427ced49d9934d3c24c894588b4be62..28bbad1353eeac8fc3d85724d345b8b0f84d2cab 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -572,7 +572,7 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev)
        priv->dss = pdata->dss;
        priv->dispc = dispc_get_dispc(priv->dss);
 
-       omap_crtc_pre_init(priv);
+       priv->dss->mgr_ops_priv = priv;
 
        soc = soc_device_match(omapdrm_soc_devices);
        priv->omaprev = soc ? (unsigned int)soc->data : 0;
@@ -625,7 +625,6 @@ err_gem_deinit:
        omap_gem_deinit(ddev);
        destroy_workqueue(priv->wq);
        omap_disconnect_pipelines(ddev);
-       omap_crtc_pre_uninit(priv);
        drm_dev_put(ddev);
        return ret;
 }
@@ -651,7 +650,6 @@ static void omapdrm_cleanup(struct omap_drm_private *priv)
        destroy_workqueue(priv->wq);
 
        omap_disconnect_pipelines(ddev);
-       omap_crtc_pre_uninit(priv);
 
        drm_dev_put(ddev);
 }