drm/omap: remove use of omapdss_find_mgr_from_display()

In order to remove uses of 'struct omap_overlay_manager' we need to get
rid of using omapdss_find_mgr_from_display() when initializing omapdrm.

Instead of using omapdss_find_mgr_from_display() and mgr->id to find the
dispc channel used for the given display, we can instead use
omapdss_find_output_from_display(), and get the output->dispc_channel
from there.

We can also remove omapdss_find_mgr_from_display() as it's no longer
used.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c
index 16072159bd24344731f03a413459a4c290793d7e..c1c099dfd62146f296ede4f8d4b24c9c9c15ac44 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -169,24 +169,6 @@ struct omap_dss_device *omapdss_find_output_from_display(struct omap_dss_device
 }
 EXPORT_SYMBOL(omapdss_find_output_from_display);
 
-struct omap_overlay_manager *omapdss_find_mgr_from_display(struct omap_dss_device *dssdev)
-{
-       struct omap_dss_device *out;
-       struct omap_overlay_manager *mgr;
-
-       out = omapdss_find_output_from_display(dssdev);
-
-       if (out == NULL)
-               return NULL;
-
-       mgr = out->manager;
-
-       omap_dss_put_device(out);
-
-       return mgr;
-}
-EXPORT_SYMBOL(omapdss_find_mgr_from_display);
-
 static const struct dss_mgr_ops *dss_mgr_ops;
 
 int dss_install_mgr_ops(const struct dss_mgr_ops *mgr_ops)

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index e21433c3fda4b0cd01f4b62df5d06556f8c082eb..c69a519f5d873459df2070eed868f49d4ddaeda0 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -352,7 +352,7 @@ static int omap_modeset_init(struct drm_device *dev)
                struct drm_connector *connector;
                struct drm_encoder *encoder;
                enum omap_channel channel;
-               struct omap_overlay_manager *mgr;
+               struct omap_dss_device *out;
 
                if (!omapdss_device_is_connected(dssdev))
                        continue;
@@ -399,8 +399,10 @@ static int omap_modeset_init(struct drm_device *dev)
                 * not considered.
                 */
 
-               mgr = omapdss_find_mgr_from_display(dssdev);
-               channel = mgr->id;
+               out = omapdss_find_output_from_display(dssdev);
+               channel = out->dispc_channel;
+               omap_dss_put_device(out);
+
                /*
                 * if this channel hasn't already been taken by a previously
                 * allocated crtc, we create a new crtc for it