From: Huang Jiachai <hjc@rock-chips.com>
Date: Fri, 28 Apr 2017 07:59:13 +0000 (+0800)
Subject: video: rockchip: vop: 3399: fix bt709 to bt2020 csc error
X-Git-Tag: release-20171130_firefly~4^2~701
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=12df93a3336fa24889f706a956624855046b6067;p=firefly-linux-kernel-4.4.55.git

video: rockchip: vop: 3399: fix bt709 to bt2020 csc error

Change-Id: I073c2dbb6693885a3c75c9ca476879544ec15349
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
---

diff --git a/drivers/video/rockchip/lcdc/rk322x_lcdc.c b/drivers/video/rockchip/lcdc/rk322x_lcdc.c
index 3e7075632d34..c670d98236d1 100644
--- a/drivers/video/rockchip/lcdc/rk322x_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk322x_lcdc.c
@@ -750,10 +750,10 @@ static int rk3399_vop_win_csc_cfg(struct rk_lcdc_driver *dev_drv)
 		} else if (output_color == COLOR_YCBCR_BT2020) {
 			if (!(IS_YUV(win->area[0].fmt_cfg) ||
 			      win->area[0].yuyv_fmt)) {
+				LOAD_CSC(vop_dev, R2R, csc_r2r_bt709to2020, i);
 				val |= V_WIN0_YUV2YUV_R2Y_EN(1) |
 					V_WIN0_YUV2YUV_EN(1);
 				if ((win->id == 0) || (win->id == 1)) {
-					LOAD_CSC(vop_dev, R2R, csc_r2r_bt709to2020, i);
 					LOAD_CSC(vop_dev, R2Y, csc_r2y_bt2020, i);
 				} else {
 					val |= V_WIN0_YUV2YUV_R2Y_MODE(VOP_R2Y_CSC_BT2020);