From: hjc <hjc@rock-chips.com>
Date: Mon, 15 Sep 2014 07:33:16 +0000 (+0800)
Subject: rk312x lcdc: update bcsh pash
X-Git-Tag: firefly_0821_release~4709^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3d3d816506d3abe62bf7a8c9184b33e6199b0f64;p=firefly-linux-kernel-4.4.55.git

rk312x lcdc: update bcsh pash
---

diff --git a/drivers/video/rockchip/lcdc/rk312x_lcdc.c b/drivers/video/rockchip/lcdc/rk312x_lcdc.c
index 7dbdac938d00..8aa645041a10 100755
--- a/drivers/video/rockchip/lcdc/rk312x_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk312x_lcdc.c
@@ -1757,20 +1757,23 @@ static int rk312x_lcdc_open_bcsh(struct rk_lcdc_driver *dev_drv, bool open)
 	if (lcdc_dev->clk_on) {
 		if (dev_drv->overlay_mode == VOP_YUV_DOMAIN) {
 			if (dev_drv->output_color == COLOR_YCBCR)	/* bypass */
-				lcdc_msk_reg(lcdc_dev, BCSH_CTRL, m_BCSH_Y2R_EN,
-						v_BCSH_Y2R_EN(0));
+				lcdc_msk_reg(lcdc_dev, BCSH_CTRL, m_BCSH_Y2R_EN | m_BCSH_R2Y_EN,
+						v_BCSH_Y2R_EN(0) | v_BCSH_R2Y_EN(0));
 			else	/* YUV2RGB */
 				lcdc_msk_reg(lcdc_dev, BCSH_CTRL,
-						m_BCSH_Y2R_EN | m_BCSH_Y2R_CSC_MODE,
-						v_BCSH_Y2R_EN(1) | v_BCSH_Y2R_CSC_MODE(VOP_Y2R_CSC_MPEG));
+						m_BCSH_Y2R_EN | m_BCSH_Y2R_CSC_MODE | m_BCSH_R2Y_EN,
+						v_BCSH_Y2R_EN(1) |
+						v_BCSH_Y2R_CSC_MODE(VOP_Y2R_CSC_MPEG) |
+						v_BCSH_R2Y_EN(0));
 		} else {	/* overlay_mode=VOP_RGB_DOMAIN */
 			if (dev_drv->output_color == COLOR_RGB)	/* bypass */
 				lcdc_msk_reg(lcdc_dev, BCSH_CTRL, m_BCSH_R2Y_EN | m_BCSH_Y2R_EN,
 						v_BCSH_R2Y_EN(1) | v_BCSH_Y2R_EN(1));
 			else	/* RGB2YUV */
 				lcdc_msk_reg(lcdc_dev, BCSH_CTRL,
-						m_BCSH_R2Y_EN | m_BCSH_R2Y_CSC_MODE,
-						v_BCSH_R2Y_EN(1) | v_BCSH_R2Y_CSC_MODE(VOP_Y2R_CSC_MPEG));
+						m_BCSH_R2Y_EN | m_BCSH_R2Y_CSC_MODE | m_BCSH_Y2R_EN,
+						v_BCSH_R2Y_EN(1) | v_BCSH_R2Y_CSC_MODE(VOP_Y2R_CSC_MPEG) |
+						v_BCSH_Y2R_EN(0));
 		}
 		if (open) {
 			lcdc_msk_reg(lcdc_dev, BCSH_CTRL,m_BCSH_EN | m_BCSH_OUT_MODE,