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 844d6d2b52f0ad0c313bd29b222e83922de99118..a8c6bd7a65e2113742374b7620b6e0866f395d79 100644 (file)
--- 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 c92404bd254fa0917f4d94a6b3b21192e1241d33..ae9b34acb62b04490b8123095f27462730d2f676 100755 (executable)
--- 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);