From 851a3af8d54a78e6e72bccc4ec3fefbbe1eed3d4 Mon Sep 17 00:00:00 2001
From: Archit Taneja <archit@ti.com>
Date: Thu, 3 May 2012 20:03:11 +0530
Subject: [PATCH] --- yaml --- r: 310319 b: refs/heads/master c:
 fcc36619901064a76e15a545ea36d38ba0e54192 h: refs/heads/master i:   310317:
 d3c6d0464c68a82d9832032fa89ef35033590a16   310315:
 346291f4e1dfb67fc0d3130f7a540d09c713cff7   310311:
 be7c1552d0ab6c6b4f0fc229cb7ecc7ef415ccd6   310303:
 0f0194b6d2e40ea86d7276a35254a5a5e28d6869 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/video/omap2/dss/dpi.c  | 2 ++
 trunk/drivers/video/omap2/dss/hdmi.c | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 18096191b03a..9ab2f7e57224 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 228b21349db4ca5636ec1efdb3b3d54fe18092de
+refs/heads/master: fcc36619901064a76e15a545ea36d38ba0e54192
diff --git a/trunk/drivers/video/omap2/dss/dpi.c b/trunk/drivers/video/omap2/dss/dpi.c
index e01ab9825930..d6e8fe776152 100644
--- a/trunk/drivers/video/omap2/dss/dpi.c
+++ b/trunk/drivers/video/omap2/dss/dpi.c
@@ -297,6 +297,8 @@ void dpi_set_timings(struct omap_dss_device *dssdev,
 
 		dispc_runtime_put();
 		dss_runtime_put();
+	} else {
+		dss_mgr_set_timings(dssdev->manager, timings);
 	}
 }
 EXPORT_SYMBOL(dpi_set_timings);
diff --git a/trunk/drivers/video/omap2/dss/hdmi.c b/trunk/drivers/video/omap2/dss/hdmi.c
index 8d4ff8c3d318..32ad7124a952 100644
--- a/trunk/drivers/video/omap2/dss/hdmi.c
+++ b/trunk/drivers/video/omap2/dss/hdmi.c
@@ -435,6 +435,8 @@ void omapdss_hdmi_display_set_timing(struct omap_dss_device *dssdev)
 		r = hdmi_power_on(dssdev);
 		if (r)
 			DSSERR("failed to power on device\n");
+	} else {
+		dss_mgr_set_timings(dssdev->manager, &dssdev->panel.timings);
 	}
 }