OMAPDSS: reduce vsync/go timeouts

[pandora-kernel.git] / drivers / video / omap2 / dss / manager.c

diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
index bf2b7d7..b07f817 100644 (file)
--- a/drivers/video/omap2/dss/manager.c
+++ b/drivers/video/omap2/dss/manager.c
@@ -608,7 +608,7 @@ static int omap_dss_unset_device(struct omap_overlay_manager *mgr)
 
 static int dss_mgr_wait_for_vsync(struct omap_overlay_manager *mgr)
 {
-       unsigned long timeout = msecs_to_jiffies(500);
+       unsigned long timeout = usecs_to_jiffies(16667 * 2);
        u32 irq;
        int r;
 
@@ -636,7 +636,7 @@ static int dss_mgr_wait_for_vsync(struct omap_overlay_manager *mgr)
 
 static int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr)
 {
-       unsigned long timeout = msecs_to_jiffies(500);
+       unsigned long timeout = usecs_to_jiffies(16667 * 2);
        struct manager_cache_data *mc;
        u32 irq;
        int r;
@@ -1020,7 +1020,9 @@ static int configure_dispc(void)
        busy = false;
 
        for (i = 0; i < num_mgrs; i++) {
-               mgr_busy[i] = dispc_mgr_go_busy(i);
+               /* pandora HACK: if something is running faster than display,
+                * it's ok to lose older frame config. */
+               mgr_busy[i] = false; /*dispc_mgr_go_busy(i);*/
                mgr_go[i] = false;
        }