diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-05 07:09:33 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-07 13:02:13 -0400 |
commit | b82fe7f025183897880771dd7cdf725ecc148ff2 (patch) | |
tree | c780a0d02442250f3c63f285930065d14268756e /drivers/video/omap2/dss/hdmi.c | |
parent | 66a0f9e4ac46144fb86ebe90f58ce6f416a55cd5 (diff) |
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/hdmi.c')
-rw-r--r-- | drivers/video/omap2/dss/hdmi.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index ccfc677c910a..83f18458a406 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c | |||
@@ -632,18 +632,6 @@ void omapdss_hdmi_display_set_timing(struct omap_dss_device *dssdev, | |||
632 | if (t != NULL) | 632 | if (t != NULL) |
633 | hdmi.ip_data.cfg = *t; | 633 | hdmi.ip_data.cfg = *t; |
634 | 634 | ||
635 | if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) { | ||
636 | int r; | ||
637 | |||
638 | hdmi_power_off(dssdev); | ||
639 | |||
640 | r = hdmi_power_on(dssdev); | ||
641 | if (r) | ||
642 | DSSERR("failed to power on device\n"); | ||
643 | } else { | ||
644 | dss_mgr_set_timings(dssdev->manager, &t->timings); | ||
645 | } | ||
646 | |||
647 | mutex_unlock(&hdmi.lock); | 635 | mutex_unlock(&hdmi.lock); |
648 | } | 636 | } |
649 | 637 | ||