From: Mark Yao <mark.yao@rock-chips.com>
Date: Fri, 3 Mar 2017 00:46:17 +0000 (+0800)
Subject: drm/rockchip: vop: fixup color space table
X-Git-Tag: firefly_0821_release~408
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=8a4cea274174c18085a62902feba3270238bf4ae

drm/rockchip: vop: fixup color space table

Change-Id: Ia3c14602ffe837efd2fb4dcf8d3dd2c0960cfce6
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
---

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index ae53285ba855..886534175f5f 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -1124,7 +1124,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
 	if (win->csc) {
 		vop_load_csc_table(vop, win->csc->y2r_offset, y2r_table);
 		vop_load_csc_table(vop, win->csc->r2r_offset, r2r_table);
-		vop_load_csc_table(vop, win->csc->r2r_offset, r2y_table);
+		vop_load_csc_table(vop, win->csc->r2y_offset, r2y_table);
 		VOP_WIN_SET_EXT(vop, win, csc, y2r_en, !!y2r_table);
 		VOP_WIN_SET_EXT(vop, win, csc, r2r_en, !!r2r_table);
 		VOP_WIN_SET_EXT(vop, win, csc, r2y_en, !!r2y_table);
diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
index 3c97af58d2d1..b4cee84650f4 100644
--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
+++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
@@ -432,7 +432,7 @@ static const uint32_t vop_csc_y2r_bt709[] = {
 
 static const uint32_t vop_csc_r2y_bt709[] = {
 	0x027500bb, 0xff99003f, 0x01c2fea5, 0xfe6801c2,
-	0xffd7fe68, 0x00010200, 0x00080200, 0x00080200,
+	0x0000ffd7, 0x00010200, 0x00080200, 0x00080200,
 };
 
 static const uint32_t vop_csc_y2r_bt2020[] = {