From: xuhuicong <xhc@rock-chips.com>
Date: Thu, 27 Oct 2016 12:55:49 +0000 (+0800)
Subject: video: rockchip: dp: do no support 4k when use vop1
X-Git-Tag: firefly_0821_release~1345
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=c3f6816f324ea9363fc3caf1fbbc2601b070fa8d

video: rockchip: dp: do no support 4k when use vop1

Change-Id: I3ff56100947d04b703f15f22616b5e9ef73bbb06
Signed-off-by: xuhuicong <xhc@rock-chips.com>
---

diff --git a/drivers/video/rockchip/dp/rockchip_dp.c b/drivers/video/rockchip/dp/rockchip_dp.c
index 552785dbea7b..70c17c944991 100644
--- a/drivers/video/rockchip/dp/rockchip_dp.c
+++ b/drivers/video/rockchip/dp/rockchip_dp.c
@@ -238,13 +238,17 @@ int cdn_dp_fb_register(struct platform_device *pdev, void *dp)
 				SUPPORT_YCBCR_INPUT |
 				SUPPORT_1080I |
 				SUPPORT_480I_576I |
-				SUPPORT_4K |
-				SUPPORT_4K_4096 |
-				SUPPORT_YUV420 |
-				SUPPORT_YCBCR_INPUT |
-				SUPPORT_TMDS_600M |
 				SUPPORT_RK_DISCRETE_VR;
 
+	if (!rk_cdn_dp_prop->videosrc) {
+		rk_cdn_dp_prop->feature |=
+					SUPPORT_4K |
+					SUPPORT_4K_4096 |
+					SUPPORT_YUV420 |
+					SUPPORT_YCBCR_INPUT |
+					SUPPORT_TMDS_600M;
+	}
+
 	dp_dev->hdmi = rockchip_hdmi_register(rk_cdn_dp_prop,
 						rk_dp_ops);
 	dp_dev->hdmi->dev = dev;