drm/omap: convert dss_mgr_set_timings to accept omap_channel

We are removing uses of 'struct omap_overlay_manager'. This patch
changes dss_mgr_set_timings() 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/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
index a877cfebd2d5e53ea64f6d0ecdb5aef831158a25..91d0f5ab0bf790430ff4a5a6bccdb089251b7f0f 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -359,7 +359,7 @@ static int dpi_set_mode(struct dpi_data *dpi)
                t->pixelclock = pck;
        }
 
-       dss_mgr_set_timings(mgr, t);
+       dss_mgr_set_timings(mgr->id, t);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index a2c83691506f2bcac48349572f53ee5bc05c1df4..a06c7b83a7b61cc508a6298e9f74a76b1672a7fb 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -3980,7 +3980,7 @@ static void dsi_update_screen_dispc(struct platform_device *dsidev)
                msecs_to_jiffies(250));
        BUG_ON(r == 0);
 
-       dss_mgr_set_timings(mgr, &dsi->timings);
+       dss_mgr_set_timings(mgr->id, &dsi->timings);
 
        dss_mgr_start_update(mgr);
 
@@ -4140,7 +4140,7 @@ static int dsi_display_init_dispc(struct platform_device *dsidev,
        dsi->timings.de_level = OMAPDSS_SIG_ACTIVE_HIGH;
        dsi->timings.sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE;
 
-       dss_mgr_set_timings(mgr, &dsi->timings);
+       dss_mgr_set_timings(mgr->id, &dsi->timings);
 
        r = dsi_configure_dispc_clocks(dsidev);
        if (r)

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

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

diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 38da4be6ff1578940c4e970529a83ebd898f6b4b..e66d4bb468bb7fe76e98bd229e8c71dfccef548e 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -86,7 +86,7 @@ int dss_mgr_connect(enum omap_channel channel,
                struct omap_dss_device *dst);
 void dss_mgr_disconnect(enum omap_channel channel,
                struct omap_dss_device *dst);
-void dss_mgr_set_timings(struct omap_overlay_manager *mgr,
+void dss_mgr_set_timings(enum omap_channel channel,
                const struct omap_video_timings *timings);
 void dss_mgr_set_lcd_config(struct omap_overlay_manager *mgr,
                const struct dss_lcd_mgr_config *config);

diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c
index 0ca46f37681fdc6d7ecb710d44570daeb22882c1..20255cae6084e533f5c897189d7f6421e99d756e 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -202,10 +202,10 @@ void dss_mgr_disconnect(enum omap_channel channel,
 }
 EXPORT_SYMBOL(dss_mgr_disconnect);
 
-void dss_mgr_set_timings(struct omap_overlay_manager *mgr,
+void dss_mgr_set_timings(enum omap_channel channel,
                const struct omap_video_timings *timings)
 {
-       dss_mgr_ops->set_timings(mgr->id, timings);
+       dss_mgr_ops->set_timings(channel, timings);
 }
 EXPORT_SYMBOL(dss_mgr_set_timings);
 

diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
index 0d9f40646a34afe7e2973dcb992cd6e4c284ee2a..3b16a5b64a678e50dee53c23d80474f031c607fb 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -169,7 +169,7 @@ static int sdi_display_enable(struct omap_dss_device *dssdev)
        }
 
 
-       dss_mgr_set_timings(out->manager, t);
+       dss_mgr_set_timings(out->manager->id, t);
 
        r = dss_set_fck_rate(fck);
        if (r)

diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index 2a4bd2537040d7e2a2b7e3bbf5f9538c23059642..af760ec7f5dd3669c625bacca4a275f1a7a4150c 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -469,7 +469,7 @@ static int venc_power_on(struct omap_dss_device *dssdev)
 
        venc_write_reg(VENC_OUTPUT_CONTROL, l);
 
-       dss_mgr_set_timings(mgr, &venc.timings);
+       dss_mgr_set_timings(mgr->id, &venc.timings);
 
        r = regulator_enable(venc.vdda_dac_reg);
        if (r)