summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2012-05-21 09:47:12 +0530
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-05-22 11:00:08 +0300
commitc808ab9c82b20227a8b7659c5c8b75290047523c (patch)
treea1cd624c6a2890aa355f1265d436207d68a320ee /drivers/video
parent2aefad49d8e3a898cf629d4c5264ffd061113531 (diff)
downloadlinux-3.10-c808ab9c82b20227a8b7659c5c8b75290047523c.tar.gz
linux-3.10-c808ab9c82b20227a8b7659c5c8b75290047523c.tar.bz2
linux-3.10-c808ab9c82b20227a8b7659c5c8b75290047523c.zip
OMAPDSS: Apply VENC timings even if panel is disabled
The VENC interfaces uses it's venc_set_timing() function to take in a new set of timings. If the panel is disabled, it does not disable and re-enable the interface. Currently, the manager timings are applied in venc_power_on(), these are not called by set_timings if the panel is disabled. When checking overlay and manager data, the DSS driver uses the last applied manager timings, and not the timings held by omap_dss_device struct. Hence, there is a need to apply the new manager timings even if the panel is disabled. Apply the manager timings if the VENC panel is disabled. This is similar to the commit below which fixed the same issue for HDMI/DPI interfaces: fcc36619901064a76e15a545ea36d38ba0e54192 Signed-off-by: Archit Taneja <archit@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap2/dss/venc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index 09be43d02ad..2b8973931ff 100644
--- a/drivers/video/omap2/dss/venc.c
+++ b/drivers/video/omap2/dss/venc.c
@@ -645,6 +645,8 @@ static void venc_set_timings(struct omap_dss_device *dssdev,
/* turn the venc off and on to get new timings to use */
venc_panel_disable(dssdev);
venc_panel_enable(dssdev);
+ } else {
+ dss_mgr_set_timings(dssdev->manager, timings);
}
}