X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=drivers%2Fvideo%2Fomap2%2Fdss%2Fmanager.c;h=b07f8175c5f73f4b1855fdaf8e82501d5c5efe08;hp=86005bc92a291e1b9b724559afe33addd13f8835;hb=eedbf54c24b94d10b67ff39d53728b8411b6f96b;hpb=06a6fe04ad4ec53c10a7dce85fbefcc0b2fe93db

diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
index 86005bc92a29..b07f8175c5f7 100644
--- 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;