From: Mark Yao <mark.yao@rock-chips.com>
Date: Fri, 12 May 2017 06:23:12 +0000 (+0800)
Subject: drm/rockchip: vop: correct rk322x vop define
X-Git-Tag: release-20171130_firefly~4^2~586
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=73766c5da77ff9e52068990f68e5ce670b4046ec;p=firefly-linux-kernel-4.4.55.git

drm/rockchip: vop: correct rk322x vop define

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

diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
index e3e2b08377d3..e4bf6d428b07 100644
--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
+++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
@@ -542,6 +542,13 @@ static const struct vop_data rk3399_vop_lit = {
 	.win_size = ARRAY_SIZE(rk3399_vop_lit_win_data),
 };
 
+static const struct vop_win_data rk322x_vop_win_data[] = {
+	{ .base = 0x00, .phy = &rk3288_win01_data,
+	  .type = DRM_PLANE_TYPE_PRIMARY },
+	{ .base = 0x40, .phy = &rk3288_win01_data,
+	  .type = DRM_PLANE_TYPE_CURSOR },
+};
+
 static const struct vop_data rk322x_vop = {
 	.version = VOP_VERSION(3, 7),
 	.feature = VOP_FEATURE_OUTPUT_10BIT,
@@ -549,8 +556,8 @@ static const struct vop_data rk322x_vop = {
 	.max_output = {4096, 2160},
 	.intr = &rk3366_vop_intr,
 	.ctrl = &rk3288_ctrl_data,
-	.win = rk3368_vop_win_data,
-	.win_size = ARRAY_SIZE(rk3368_vop_win_data),
+	.win = rk322x_vop_win_data,
+	.win_size = ARRAY_SIZE(rk322x_vop_win_data),
 };
 
 static const struct vop_ctrl rk3328_ctrl_data = {