1 files changed, 40 insertions, 8 deletions

diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
index 27d9c465c851..913142d4cab1 100644
--- a/drivers/video/omap2/dss/manager.c
+++ b/drivers/video/omap2/dss/manager.c
@@ -501,6 +501,19 @@ static int omap_dss_unset_device(struct omap_overlay_manager *mgr)
         return 0;
 }
 
+static int dss_mgr_wait_for_vsync(struct omap_overlay_manager *mgr)
+{
+        unsigned long timeout = msecs_to_jiffies(500);
+        u32 irq;
+
+        if (mgr->device->type == OMAP_DISPLAY_TYPE_VENC)
+                irq = DISPC_IRQ_EVSYNC_ODD;
+        else
+                irq = DISPC_IRQ_VSYNC;
+
+        return omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout);
+}
+
 static int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr)
 {
         unsigned long timeout = msecs_to_jiffies(500);
@@ -509,17 +522,18 @@ static int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr)
         u32 irq;
         int r;
         int i;
+        struct omap_dss_device *dssdev = mgr->device;
 
-        if (!mgr->device)
+        if (!dssdev)
                 return 0;
 
-        if (mgr->device->type == OMAP_DISPLAY_TYPE_VENC) {
+        if (dssdev->type == OMAP_DISPLAY_TYPE_VENC) {
                 irq = DISPC_IRQ_EVSYNC_ODD | DISPC_IRQ_EVSYNC_EVEN;
                 channel = OMAP_DSS_CHANNEL_DIGIT;
         } else {
-                if (mgr->device->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
+                if (dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
                         enum omap_dss_update_mode mode;
-                        mode = mgr->device->get_update_mode(mgr->device);
+                        mode = dssdev->driver->get_update_mode(dssdev);
                         if (mode != OMAP_DSS_UPDATE_AUTO)
                                 return 0;
 
@@ -592,7 +606,7 @@ int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl)
         } else {
                 if (dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
                         enum omap_dss_update_mode mode;
-                        mode = dssdev->get_update_mode(dssdev);
+                        mode = dssdev->driver->get_update_mode(dssdev);
                         if (mode != OMAP_DSS_UPDATE_AUTO)
                                 return 0;
 
@@ -1064,7 +1078,7 @@ void dss_start_update(struct omap_dss_device *dssdev)
                 mc->shadow_dirty = false;
         }
 
-        dispc_enable_lcd_out(1);
+        dssdev->manager->enable(dssdev->manager);
 }
 
 static void dss_apply_irq_handler(void *data, u32 mask)
@@ -1196,7 +1210,8 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
 
                 oc->manual_update =
                         dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE &&
-                        dssdev->get_update_mode(dssdev) != OMAP_DSS_UPDATE_AUTO;
+                        dssdev->driver->get_update_mode(dssdev) !=
+                                OMAP_DSS_UPDATE_AUTO;
 
                 ++num_planes_enabled;
         }
@@ -1237,7 +1252,8 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
 
                 mc->manual_update =
                         dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE &&
-                        dssdev->get_update_mode(dssdev) != OMAP_DSS_UPDATE_AUTO;
+                        dssdev->driver->get_update_mode(dssdev) !=
+                                OMAP_DSS_UPDATE_AUTO;
         }
 
         /* XXX TODO: Try to get fifomerge working. The problem is that it
@@ -1351,6 +1367,18 @@ static void omap_dss_mgr_get_info(struct omap_overlay_manager *mgr,
         *info = mgr->info;
 }
 
+static int dss_mgr_enable(struct omap_overlay_manager *mgr)
+{
+        dispc_enable_channel(mgr->id, 1);
+        return 0;
+}
+
+static int dss_mgr_disable(struct omap_overlay_manager *mgr)
+{
+        dispc_enable_channel(mgr->id, 0);
+        return 0;
+}
+
 static void omap_dss_add_overlay_manager(struct omap_overlay_manager *manager)
 {
         ++num_managers;
@@ -1394,6 +1422,10 @@ int dss_init_overlay_managers(struct platform_device *pdev)
                 mgr->set_manager_info = &omap_dss_mgr_set_info;
                 mgr->get_manager_info = &omap_dss_mgr_get_info;
                 mgr->wait_for_go = &dss_mgr_wait_for_go;
+                mgr->wait_for_vsync = &dss_mgr_wait_for_vsync;
+
+                mgr->enable = &dss_mgr_enable;
+                mgr->disable = &dss_mgr_disable;
 
                 mgr->caps = OMAP_DSS_OVL_MGR_CAP_DISPC;