diff options
author | Jing Xiang <jxiang@marvell.com> | 2013-06-10 11:52:32 -0400 |
---|---|---|
committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-06-27 04:53:14 -0400 |
commit | baf9d52cbd9bf771a923a7cdfa2dea903f6eb190 (patch) | |
tree | e4eeb8bfd504efdf873fa4645bbe37c80f4cfa73 | |
parent | 265e78c7dc8f87dc70a85f07bcf5efcd3fb98b4c (diff) |
video: mmp: fix graphics/video layer enable/mask swap issue
There is bug when switch dma of graphic layer and video layer, it
configured opposite bit, fix it.
Signed-off-by: Jing Xiang <jxiang@marvell.com>
Signed-off-by: Jett.Zhou <jtzhou@marvell.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-rw-r--r-- | drivers/video/mmp/hw/mmp_ctrl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/mmp/hw/mmp_ctrl.c b/drivers/video/mmp/hw/mmp_ctrl.c index cc62a79ed0cd..8612590ea943 100644 --- a/drivers/video/mmp/hw/mmp_ctrl.c +++ b/drivers/video/mmp/hw/mmp_ctrl.c | |||
@@ -165,9 +165,9 @@ static void overlay_set_win(struct mmp_overlay *overlay, struct mmp_win *win) | |||
165 | 165 | ||
166 | static void dmafetch_onoff(struct mmp_overlay *overlay, int on) | 166 | static void dmafetch_onoff(struct mmp_overlay *overlay, int on) |
167 | { | 167 | { |
168 | u32 mask = overlay_is_vid(overlay) ? CFG_GRA_ENA_MASK : | 168 | u32 mask = overlay_is_vid(overlay) ? CFG_DMA_ENA_MASK : |
169 | CFG_DMA_ENA_MASK; | 169 | CFG_GRA_ENA_MASK; |
170 | u32 enable = overlay_is_vid(overlay) ? CFG_GRA_ENA(1) : CFG_DMA_ENA(1); | 170 | u32 enable = overlay_is_vid(overlay) ? CFG_DMA_ENA(1) : CFG_GRA_ENA(1); |
171 | u32 tmp; | 171 | u32 tmp; |
172 | struct mmp_path *path = overlay->path; | 172 | struct mmp_path *path = overlay->path; |
173 | 173 | ||