drm/omap: convert dss_mgr_disable to accept omap_channel

We are removing uses of 'struct omap_overlay_manager'. This patch
changes dss_mgr_disable() 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 b0cf2dd147cfbac7700dffb75bf30057e0344c0a..ef565b67650fac8f6c794c82fe3dc840ceefd50c 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dispc-compat.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc-compat.c
@@ -379,7 +379,7 @@ static void dispc_error_worker(struct work_struct *work)
                                        "with video overlays disabled\n",
                                        mgr->name);
 
-                       dss_mgr_disable(mgr);
+                       dss_mgr_disable(mgr->id);
 
                        for (j = 0; j < omap_dss_get_num_overlays(); ++j) {
                                struct omap_overlay *ovl;
@@ -400,7 +400,7 @@ static void dispc_error_worker(struct work_struct *work)
                        struct omap_overlay_manager *mgr;
 
                        mgr = omap_dss_get_overlay_manager(i);
-                       dss_mgr_disable(mgr);
+                       dss_mgr_disable(mgr->id);
                }
        }
 

diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
index 8d64fdbc53fa7879b7203c8b1fd04a5d4e5bc940..cd6254bee6567e8430596102f06ea816a4e73765 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -461,7 +461,7 @@ static void dpi_display_disable(struct omap_dss_device *dssdev)
 
        mutex_lock(&dpi->lock);
 
-       dss_mgr_disable(mgr);
+       dss_mgr_disable(mgr->id);
 
        if (dpi->pll) {
                dss_select_lcd_clk_source(mgr->id, OMAP_DSS_CLK_SRC_FCK);

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index f3881d180d4e2ccd7e5f7a7f7e1fad22ef3b040f..08751c9cc973a43505ca5ca11057ce9ce8895206 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -3910,7 +3910,7 @@ static void dsi_disable_video_output(struct omap_dss_device *dssdev, int channel
                dsi_if_enable(dsidev, true);
        }
 
-       dss_mgr_disable(mgr);
+       dss_mgr_disable(mgr->id);
 
        dsi_display_uninit_dispc(dsidev, mgr);
 }

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index 3f3e197ed08373be6bd43abd22ceea3508643e00..f8ed407f148e3e3ddb5101f6b4aa0c5c7985a77c 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -233,7 +233,7 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
        return 0;
 
 err_vid_enable:
-       dss_mgr_disable(mgr);
+       dss_mgr_disable(mgr->id);
 err_mgr_enable:
        hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF);
 err_phy_pwr:
@@ -253,7 +253,7 @@ static void hdmi_power_off_full(struct omap_dss_device *dssdev)
 
        hdmi_wp_video_stop(&hdmi.wp);
 
-       dss_mgr_disable(mgr);
+       dss_mgr_disable(mgr->id);
 
        hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF);
 

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index 7ae447382ea5df54b2fdd11fed7cfc6d45036d54..b75f15e15797598bc184831a8ef2b2e9acb45de8 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -250,7 +250,7 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
        return 0;
 
 err_vid_enable:
-       dss_mgr_disable(mgr);
+       dss_mgr_disable(mgr->id);
 err_mgr_enable:
        hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF);
 err_phy_pwr:
@@ -270,7 +270,7 @@ static void hdmi_power_off_full(struct omap_dss_device *dssdev)
 
        hdmi_wp_video_stop(&hdmi.wp);
 
-       dss_mgr_disable(mgr);
+       dss_mgr_disable(mgr->id);
 
        hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF);
 

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

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

diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
index 22dfda5fea90d2d6f0a0357e6a01a8f724999b15..e00aaabb77b84ae2ac2fc0bfc10f1f9d3384ca6a 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -218,7 +218,7 @@ static void sdi_display_disable(struct omap_dss_device *dssdev)
 {
        struct omap_overlay_manager *mgr = sdi.output.manager;
 
-       dss_mgr_disable(mgr);
+       dss_mgr_disable(mgr->id);
 
        dss_sdi_disable();
 

diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index aae4cd0ae5ce9f2c7465841bcfedf50664baa642..401c477242b100f8cc73b04d909b7080f2804d3b 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -499,7 +499,7 @@ static void venc_power_off(struct omap_dss_device *dssdev)
        venc_write_reg(VENC_OUTPUT_CONTROL, 0);
        dss_set_dac_pwrdn_bgz(0);
 
-       dss_mgr_disable(mgr);
+       dss_mgr_disable(mgr->id);
 
        regulator_disable(venc.vdda_dac_reg);