summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLajos Molnar <molnar@ti.com>2010-09-18 23:56:03 -0500
committerSebastien Jan <s-jan@ti.com>2010-11-03 15:58:00 +0100
commit2f2bc25c986d2fd89ab5511b159096f9849290b7 (patch)
tree48a44a725aaf6d2c8a1e6c9318b80cb82ff3f8f0
parentc09e459fa22ddad46a1ea1afb5b949ce18ba93c4 (diff)
DSS: Set channel output in _dispc_setup_plane.
This is needed because channel output was only set when changing the channel (manager) of an overlay. This was not called on wake-up from sleep, which resulted in uninitialized channel out. Signed-off-by: Lajos Molnar <molnar@ti.com>
-rw-r--r--drivers/video/omap2/dss/dispc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 23533e176b58..70dd59507d18 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -2926,6 +2926,7 @@ static int _dispc_setup_plane(enum omap_plane plane,
DSSDBG("offset0 %u, offset1 %u, row_inc %d, pix_inc %d\n",
offset0, offset1, row_inc, pix_inc);
+ _dispc_set_channel_out(plane, channel);
_dispc_set_color_mode(plane, color_mode);
_dispc_set_plane_ba0(plane, paddr + offset0);