---

yaml
---
r: 251017
b: refs/heads/master
c: c6f65e1
h: refs/heads/master
i:
  251015: a9322e1
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1aafdcd42ad45a4bda5cb8f4a6782b0e48549ba
+refs/heads/master: c6f65e1a4381a2271de1b5dccc94d6c6faad26dc

trunk/drivers/video/omap2/dss/Kconfig

@@ -136,4 +136,16 @@ config OMAP2_DSS_SLEEP_BEFORE_RESET
 	  However, 50ms is quite long time to sleep, and with some
 	  configurations the SYNC_LOST may never happen, so the sleep can
 	  be disabled here.
+
+config OMAP2_DSS_SLEEP_AFTER_VENC_RESET
+	bool "Sleep 20ms after VENC reset"
+	default y
+	help
+	  There is a 20ms sleep after VENC reset which seemed to fix the
+	  reset. The reason for the bug is unclear, and it's also unclear
+	  on what platforms this happens.
+
+	  This option enables the sleep, and is enabled by default. You can
+	  disable the sleep if it doesn't cause problems on your platform.
+
 endif

trunk/drivers/video/omap2/dss/venc.c

@@ -373,8 +373,11 @@ static void venc_reset(void)
 		}
 	}
 
+#ifdef CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET
 	/* the magical sleep that makes things work */
+	/* XXX more info? What bug this circumvents? */
 	msleep(20);
+#endif
 }
 
 static void venc_enable_clocks(int enable)