diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-05 14:09:33 +0300 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-07 20:02:13 +0300 |
commit | b82fe7f025183897880771dd7cdf725ecc148ff2 (patch) | |
tree | c780a0d02442250f3c63f285930065d14268756e /drivers/video/omap2/dss/dpi.c | |
parent | 66a0f9e4ac46144fb86ebe90f58ce6f416a55cd5 (diff) | |
download | linux-stable-b82fe7f025183897880771dd7cdf725ecc148ff2.tar.gz linux-stable-b82fe7f025183897880771dd7cdf725ecc148ff2.tar.bz2 linux-stable-b82fe7f025183897880771dd7cdf725ecc148ff2.zip |
OMAPDSS: fix set_timings
set_timings function of DSS's output drivers are not consistent. Some of
them disable the output, set the timings, and re-enable the output. Some
set the timings on the fly, while the output is enabled. And some just
store the given timings, so that they will be taken into use next time
the output is enabled.
We require the DISPC output to be disabled when changing the timings,
and so we can change all the output drivers' set_timings to just store
the given timings.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/dpi.c')
-rw-r--r-- | drivers/video/omap2/dss/dpi.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c index 99b9851f8429..5ccce9b69e42 100644 --- a/drivers/video/omap2/dss/dpi.c +++ b/drivers/video/omap2/dss/dpi.c @@ -277,26 +277,12 @@ EXPORT_SYMBOL(omapdss_dpi_display_disable); void omapdss_dpi_set_timings(struct omap_dss_device *dssdev, struct omap_video_timings *timings) { - int r; - DSSDBG("dpi_set_timings\n"); mutex_lock(&dpi.lock); dpi.timings = *timings; - if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) { - r = dispc_runtime_get(); - if (r) - return; - - dpi_set_mode(dssdev); - - dispc_runtime_put(); - } else { - dss_mgr_set_timings(dssdev->manager, timings); - } - mutex_unlock(&dpi.lock); } EXPORT_SYMBOL(omapdss_dpi_set_timings); |