diff options
| author | Lajos Molnar <molnar@ti.com> | 2010-10-09 12:38:15 -0500 |
|---|---|---|
| committer | Samreen <samreen@ti.com> | 2010-10-29 16:02:46 +0530 |
| commit | 7f5c6f489e368167a29c4ceae223a4b7b3c2e369 (patch) | |
| tree | d35de2e35824152736e08d9ffb593c6b72923d4e | |
| parent | 2f8ec16febf8903f47b196151dd4f4701924d4aa (diff) | |
OMAP/DSS2: Do not set channel out in overlay's set_manager if OFF
If DSS is off we should not (and there is no need to) set the
pipeline's channel out.
Signed-off-by: Lajos Molnar <molnar@ti.com>
| -rw-r--r-- | drivers/video/omap2/dss/overlay.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/overlay.c b/drivers/video/omap2/dss/overlay.c index f8204e550f57..6b461e83b297 100644 --- a/drivers/video/omap2/dss/overlay.c +++ b/drivers/video/omap2/dss/overlay.c @@ -600,6 +600,10 @@ static int omap_dss_set_manager(struct omap_overlay *ovl, ovl->manager = mgr; + /* do not set channel out if DSS is off */ + if (!dss_get_mainclk_state()) + return 0; + dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1); /* XXX: on manual update display, in auto update mode, a bug happens * here. When an overlay is first enabled on LCD, then it's disabled, |