X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=blobdiff_plain;f=drivers%2Fgpu%2Fdrm%2Frockchip%2Frockchip_vop_reg.c;fp=drivers%2Fgpu%2Fdrm%2Frockchip%2Frockchip_vop_reg.c;h=9f89c110fa7b904432d5b43e3ee4b4a577d295a3;hp=1899e458ca308775aab4afac8a726204e3d46d42;hb=84ebff1a85cf84254da236de46bddfe2efd75ecb;hpb=0f8aea826a81c531f328abbf80dcbfd34799489b

diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
index 1899e458ca30..9f89c110fa7b 100644
--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
+++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
@@ -266,14 +266,13 @@ static const struct vop_intr rk3288_vop_intr = {
 static const struct vop_data rk3288_vop = {
 	.version = VOP_VERSION(3, 1),
 	.feature = VOP_FEATURE_OUTPUT_10BIT,
-	.max_input_fb = { 4096, 8192},
-	.max_output_fb = { 3840, 2160},
+	.max_input = {4096, 8192},
 	/*
 	 * TODO: rk3288 have two vop, big one support 3840x2160,
 	 * little one only support 2560x1600.
 	 * Now force use 3840x2160.
 	 */
-	.max_disably_output = { 3840, 2160},
+	.max_output = {3840, 2160},
 	.intr = &rk3288_vop_intr,
 	.ctrl = &rk3288_ctrl_data,
 	.win = rk3288_vop_win_data,
@@ -377,9 +376,8 @@ static const struct vop_win_data rk3368_vop_win_data[] = {
 static const struct vop_data rk3368_vop = {
 	.version = VOP_VERSION(3, 2),
 	.feature = VOP_FEATURE_OUTPUT_10BIT,
-	.max_input_fb = { 4096, 8192},
-	.max_output_fb = { 4096, 2160},
-	.max_disably_output = { 4096, 2160},
+	.max_input = {4096, 8192},
+	.max_output = {4096, 2160},
 	.intr = &rk3368_vop_intr,
 	.ctrl = &rk3288_ctrl_data,
 	.win = rk3368_vop_win_data,
@@ -399,9 +397,8 @@ static const struct vop_intr rk3366_vop_intr = {
 static const struct vop_data rk3366_vop = {
 	.version = VOP_VERSION(3, 4),
 	.feature = VOP_FEATURE_OUTPUT_10BIT,
-	.max_input_fb = { 4096, 8192},
-	.max_output_fb = { 4096, 2160},
-	.max_disably_output = { 4096, 2160},
+	.max_input = {4096, 8192},
+	.max_output = {4096, 2160},
 	.intr = &rk3366_vop_intr,
 	.ctrl = &rk3288_ctrl_data,
 	.win = rk3368_vop_win_data,
@@ -511,9 +508,8 @@ static const struct vop_data rk3399_vop_big = {
 	.version = VOP_VERSION(3, 5),
 	.csc_table = &rk3399_csc_table,
 	.feature = VOP_FEATURE_OUTPUT_10BIT | VOP_FEATURE_AFBDC,
-	.max_input_fb = { 4096, 8192},
-	.max_output_fb = { 4096, 2160},
-	.max_disably_output = { 4096, 2160},
+	.max_input = {4096, 8192},
+	.max_output = {4096, 2160},
 	.intr = &rk3366_vop_intr,
 	.ctrl = &rk3288_ctrl_data,
 	.win = rk3399_vop_win_data,
@@ -535,9 +531,8 @@ static const struct vop_win_data rk3399_vop_lit_win_data[] = {
 static const struct vop_data rk3399_vop_lit = {
 	.version = VOP_VERSION(3, 6),
 	.csc_table = &rk3399_csc_table,
-	.max_input_fb = { 4096, 8192},
-	.max_output_fb = { 2560, 1600},
-	.max_disably_output = { 2560, 1600},
+	.max_input = {4096, 8192},
+	.max_output = {2560, 1600},
 	.intr = &rk3366_vop_intr,
 	.ctrl = &rk3288_ctrl_data,
 	.win = rk3399_vop_lit_win_data,
@@ -547,9 +542,8 @@ static const struct vop_data rk3399_vop_lit = {
 static const struct vop_data rk322x_vop = {
 	.version = VOP_VERSION(3, 7),
 	.feature = VOP_FEATURE_OUTPUT_10BIT,
-	.max_input_fb = { 4096, 8192},
-	.max_output_fb = { 4096, 2160},
-	.max_disably_output = { 4096, 2160},
+	.max_input = {4096, 8192},
+	.max_output = {4096, 2160},
 	.intr = &rk3366_vop_intr,
 	.ctrl = &rk3288_ctrl_data,
 	.win = rk3368_vop_win_data,
@@ -634,9 +628,8 @@ static const struct vop_ctrl rk3036_ctrl_data = {
 
 static const struct vop_data rk3036_vop = {
 	.version = VOP_VERSION(2, 2),
-	.max_input_fb = { 1920, 1080},
-	.max_output_fb = { 1920, 1080},
-	.max_disably_output = { 1920, 1080},
+	.max_input = {1920, 1080},
+	.max_output = {1920, 1080},
 	.ctrl = &rk3036_ctrl_data,
 	.intr = &rk3036_intr,
 	.win = rk3036_vop_win_data,