drm/omap: convert dss_mgr_enable to accept omap_channel

We are removing uses of 'struct omap_overlay_manager'. This patch
changes dss_mgr_enable() to accept 'enum omap_channel' instead of
'struct omap_overlay_manager'.

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

diff --git a/drivers/gpu/drm/omapdrm/dss/dispc-compat.c b/drivers/gpu/drm/omapdrm/dss/dispc-compat.c
index 0918b3bfe82a85bd1b29009ec4a38e6fd5c0144f..b0cf2dd147cfbac7700dffb75bf30057e0344c0a 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dispc-compat.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc-compat.c
@@ -390,7 +390,7 @@ static void dispc_error_worker(struct work_struct *work)
                                        ovl->disable(ovl);
                        }
 
-                       dss_mgr_enable(mgr);
+                       dss_mgr_enable(mgr->id);
                }
        }
 

diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
index 17d1a3ff6baba4e08976ff4d217c55a5221b0145..8d64fdbc53fa7879b7203c8b1fd04a5d4e5bc940 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -429,7 +429,7 @@ static int dpi_display_enable(struct omap_dss_device *dssdev)
 
        mdelay(2);
 
-       r = dss_mgr_enable(out->manager);
+       r = dss_mgr_enable(out->manager->id);
        if (r)
                goto err_mgr_enable;
 

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 5709695c7e60a7c1deb1d42e9f7f4df2446deaea..f3881d180d4e2ccd7e5f7a7f7e1fad22ef3b040f 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -3876,7 +3876,7 @@ static int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel)
                dsi_if_enable(dsidev, true);
        }
 
-       r = dss_mgr_enable(mgr);
+       r = dss_mgr_enable(mgr->id);
        if (r)
                goto err_mgr_enable;
 

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index 8d44103ebf962bba24fe514b6a3ba8eb0f69aa2f..3f3e197ed08373be6bd43abd22ceea3508643e00 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -219,7 +219,7 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
        /* tv size */
        dss_mgr_set_timings(mgr->id, p);
 
-       r = dss_mgr_enable(mgr);
+       r = dss_mgr_enable(mgr->id);
        if (r)
                goto err_mgr_enable;
 

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index 7a299eb5a87a602cab2659a83a3af17753d11a0d..7ae447382ea5df54b2fdd11fed7cfc6d45036d54 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -236,7 +236,7 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
        /* tv size */
        dss_mgr_set_timings(mgr->id, p);
 
-       r = dss_mgr_enable(mgr);
+       r = dss_mgr_enable(mgr->id);
        if (r)
                goto err_mgr_enable;
 

diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 951fc18cb5ba92d0d54303670bb4a3bfe21da02d..c76802df6b00090cd25db50e0c331183c6038cae 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -90,7 +90,7 @@ void dss_mgr_set_timings(enum omap_channel channel,
                const struct omap_video_timings *timings);
 void dss_mgr_set_lcd_config(enum omap_channel channel,
                const struct dss_lcd_mgr_config *config);
-int dss_mgr_enable(struct omap_overlay_manager *mgr);
+int dss_mgr_enable(enum omap_channel channel);
 void dss_mgr_disable(struct omap_overlay_manager *mgr);
 void dss_mgr_start_update(struct omap_overlay_manager *mgr);
 int dss_mgr_register_framedone_handler(struct omap_overlay_manager *mgr,

diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c
index f926ed7a54991685e4a31d575f922ef14af1028b..cb90a9c9d84d717b77f21098a7a93ac9017659fc 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -216,9 +216,9 @@ void dss_mgr_set_lcd_config(enum omap_channel channel,
 }
 EXPORT_SYMBOL(dss_mgr_set_lcd_config);
 
-int dss_mgr_enable(struct omap_overlay_manager *mgr)
+int dss_mgr_enable(enum omap_channel channel)
 {
-       return dss_mgr_ops->enable(mgr->id);
+       return dss_mgr_ops->enable(channel);
 }
 EXPORT_SYMBOL(dss_mgr_enable);
 

diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
index a42c405c04e94cad663e5eae8b60565c2fa6ef3b..22dfda5fea90d2d6f0a0357e6a01a8f724999b15 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -196,7 +196,7 @@ static int sdi_display_enable(struct omap_dss_device *dssdev)
                goto err_sdi_enable;
        mdelay(2);
 
-       r = dss_mgr_enable(out->manager);
+       r = dss_mgr_enable(out->manager->id);
        if (r)
                goto err_mgr_enable;
 

diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index af760ec7f5dd3669c625bacca4a275f1a7a4150c..aae4cd0ae5ce9f2c7465841bcfedf50664baa642 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -475,7 +475,7 @@ static int venc_power_on(struct omap_dss_device *dssdev)
        if (r)
                goto err1;
 
-       r = dss_mgr_enable(mgr);
+       r = dss_mgr_enable(mgr->id);
        if (r)
                goto err2;