OMAPDSS: pass ovl manager to dss_start_update

dss_start_update() takes currently the dss device as a parameter. Change
the parameter to ovl manager, as that is what the dss_start_update()
actually needs. Change the name of the function to
dss_mgr_start_update() to reflect the change.

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

diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 6fc82a4a14c03be61f6c74f2d7d7f39511a22f5c..101e3b8e178b9564d45b49fcd2bf2f24b59f82f0 100644 (file)
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -4097,7 +4097,7 @@ static void dsi_update_screen_dispc(struct omap_dss_device *dssdev,
                msecs_to_jiffies(250));
        BUG_ON(r == 0);
 
-       dss_start_update(dssdev);
+       dss_mgr_start_update(dssdev->manager);
 
        if (dsi->te_enabled) {
                /* disable LP_RX_TO, so that we can receive TE.  Time to wait

diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index 7f6a612bb5b647df497fff3722bcc9006abf7968..39d48371c0ce21d61c45c03085b78c7858942eb7 100644 (file)
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -182,7 +182,7 @@ void default_get_overlay_fifo_thresholds(enum omap_plane plane,
 int dss_init_overlay_managers(struct platform_device *pdev);
 void dss_uninit_overlay_managers(struct platform_device *pdev);
 int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl);
-void dss_start_update(struct omap_dss_device *dssdev);
+void dss_mgr_start_update(struct omap_overlay_manager *mgr);
 
 /* overlay */
 void dss_init_overlays(struct platform_device *pdev);

diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
index c616f850eaf86895e2b3c00483ad8b419e8815af..268704bc6c39958c7ec0aadd80f35c9b77c27df5 100644 (file)
--- a/drivers/video/omap2/dss/manager.c
+++ b/drivers/video/omap2/dss/manager.c
@@ -896,17 +896,14 @@ static int configure_dispc(void)
        return r;
 }
 
-void dss_start_update(struct omap_dss_device *dssdev)
+void dss_mgr_start_update(struct omap_overlay_manager *mgr)
 {
        struct manager_cache_data *mc;
        struct overlay_cache_data *oc;
        const int num_ovls = dss_feat_get_num_ovls();
        const int num_mgrs = dss_feat_get_num_mgrs();
-       struct omap_overlay_manager *mgr;
        int i;
 
-       mgr = dssdev->manager;
-
        mc = &dss_cache.manager_cache[mgr->id];
 
        mc->do_manual_update = true;
@@ -929,7 +926,7 @@ void dss_start_update(struct omap_dss_device *dssdev)
                mc->shadow_dirty = false;
        }
 
-       dssdev->manager->enable(dssdev->manager);
+       mgr->enable(mgr);
 }
 
 static void dss_apply_irq_handler(void *data, u32 mask)