diff options
| author | Jing Xiang <jxiang@marvell.com> | 2013-06-10 17:52:32 +0200 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-06-27 10:53:14 +0200 |
| commit | baf9d52cbd9bf771a923a7cdfa2dea903f6eb190 (patch) | |
| tree | e4eeb8bfd504efdf873fa4645bbe37c80f4cfa73 /drivers/video/mmp | |
| parent | video: mmp: fix memcpy wrong size for mmp_addr issue (diff) | |
| download | linux-baf9d52cbd9bf771a923a7cdfa2dea903f6eb190.tar.xz linux-baf9d52cbd9bf771a923a7cdfa2dea903f6eb190.zip | |
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>
Diffstat (limited to 'drivers/video/mmp')
| -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) static void dmafetch_onoff(struct mmp_overlay *overlay, int on) { - u32 mask = overlay_is_vid(overlay) ? CFG_GRA_ENA_MASK : - CFG_DMA_ENA_MASK; - u32 enable = overlay_is_vid(overlay) ? CFG_GRA_ENA(1) : CFG_DMA_ENA(1); + u32 mask = overlay_is_vid(overlay) ? CFG_DMA_ENA_MASK : + CFG_GRA_ENA_MASK; + u32 enable = overlay_is_vid(overlay) ? CFG_DMA_ENA(1) : CFG_GRA_ENA(1); u32 tmp; struct mmp_path *path = overlay->path; |