From: Zheng Yang <zhengyang@rock-chips.com>
Date: Tue, 15 Sep 2015 01:34:26 +0000 (+0800)
Subject: video: rockchip: hdmi: 3368: support vesa dmt mode
X-Git-Tag: firefly_0821_release~3779
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f4859250d6221a3ae863c6fbd86929a00bbe546a;p=firefly-linux-kernel-4.4.55.git

video: rockchip: hdmi: 3368: support vesa dmt mode

Change-Id: Ic2a910cd50beb9b49baff7bd732f6c1bdd78790f
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
---

diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2.c b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2.c
index 844d6d2b52f0..a8c6bd7a65e2 100644
--- a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2.c
+++ b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2.c
@@ -470,7 +470,8 @@ static int rockchip_hdmiv2_probe(struct platform_device *pdev)
 				SUPPORT_4K |
 				SUPPORT_4K_4096 |
 				SUPPORT_YUV420 |
-				SUPPORT_YCBCR_INPUT;
+				SUPPORT_YCBCR_INPUT |
+				SUPPORT_VESA_DMT;
 	}
 	hdmi_dev->hdmi =
 		rockchip_hdmi_register(&rk_hdmi_property, &rk_hdmi_ops);
diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c
index c92404bd254f..ae9b34acb62b 100755
--- a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c
+++ b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c
@@ -1216,7 +1216,9 @@ static void hdmi_dev_config_avi(struct hdmi_dev *hdmi_dev,
 		     v_FC_QUAN_RANGE(rgb_quan_range));
 
 	/* Set AVI infoFrame Data byte4 */
-	if ((vpara->vic > 92 && vpara->vic < 96) || (vpara->vic == 98))
+	if ((vpara->vic > 92 && vpara->vic < 96) ||
+	    (vpara->vic == 98) ||
+	    (vpara->vic & HDMI_VIDEO_DMT))
 		hdmi_writel(hdmi_dev, FC_AVIVID, 0);
 	else
 		hdmi_writel(hdmi_dev, FC_AVIVID, vpara->vic & 0xff);