diff --git a/[refs] b/[refs]
index 751b78f722da..64df4e055bf6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ed37d9aba486dece93e05d68f691b80ee100900
+refs/heads/master: bd0f5cc3641cb76ae8fa2cc4924c29da157f8b2d
diff --git a/trunk/drivers/video/omap2/dss/dpi.c b/trunk/drivers/video/omap2/dss/dpi.c
index 6cbcc81991a1..4af136a04e53 100644
--- a/trunk/drivers/video/omap2/dss/dpi.c
+++ b/trunk/drivers/video/omap2/dss/dpi.c
@@ -51,6 +51,22 @@ static struct {
 
 static struct platform_device *dpi_get_dsidev(enum omap_channel channel)
 {
+	/*
+	 * XXX we can't currently use DSI PLL for DPI with OMAP3, as the DSI PLL
+	 * would also be used for DISPC fclk. Meaning, when the DPI output is
+	 * disabled, DISPC clock will be disabled, and TV out will stop.
+	 */
+	switch (omapdss_get_version()) {
+	case OMAPDSS_VER_OMAP24xx:
+	case OMAPDSS_VER_OMAP34xx_ES1:
+	case OMAPDSS_VER_OMAP34xx_ES3:
+	case OMAPDSS_VER_OMAP3630:
+	case OMAPDSS_VER_AM35xx:
+		return NULL;
+	default:
+		break;
+	}
+
 	switch (channel) {
 	case OMAP_DSS_CHANNEL_LCD:
 		return dsi_get_dsidev_from_id(0);