From 582d2451fe0ecd4990de7882affb66dbfb641b8e Mon Sep 17 00:00:00 2001 From: Yakir Yang Date: Tue, 27 Oct 2015 16:40:08 +0800 Subject: [PATCH] RK3288: hdmi: configure display output mode with EDID information 'edid->hdmi_monitor_detected' would indicate whether the monitor interface is HDMI or DVI. BRANCH=none BUG=chrome-os-partner:43789 TEST=Previously, my LG monitor couldn't show dev screen. But now I can see dev screen have been posted normally. Change-Id: I157861d327926b834e1e8606b0b676f413491c70 Signed-off-by: Yakir Yang Reviewed-on: https://chromium-review.googlesource.com/309370 Reviewed-by: Agnes Cheng Commit-Queue: Agnes Cheng Trybot-Ready: Agnes Cheng Tested-by: Agnes Cheng --- src/soc/rockchip/rk3288/hdmi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/soc/rockchip/rk3288/hdmi.c b/src/soc/rockchip/rk3288/hdmi.c index 9e39dde849..33e4a0a4a3 100644 --- a/src/soc/rockchip/rk3288/hdmi.c +++ b/src/soc/rockchip/rk3288/hdmi.c @@ -488,7 +488,6 @@ static int hdmi_phy_init(u32 mpixelclock) static void hdmi_av_composer(const struct edid *edid) { u8 mdataenablepolarity = 1; - u8 mdvi = 0; u8 inv_val; /* set up hdmi_fc_invidconf */ @@ -506,9 +505,9 @@ static void hdmi_av_composer(const struct edid *edid) HDMI_FC_INVIDCONF_DE_IN_POLARITY_ACTIVE_HIGH : HDMI_FC_INVIDCONF_DE_IN_POLARITY_ACTIVE_LOW); - inv_val |= (mdvi ? - HDMI_FC_INVIDCONF_DVI_MODEZ_DVI_MODE : - HDMI_FC_INVIDCONF_DVI_MODEZ_HDMI_MODE); + inv_val |= (edid->hdmi_monitor_detected ? + HDMI_FC_INVIDCONF_DVI_MODEZ_HDMI_MODE : + HDMI_FC_INVIDCONF_DVI_MODEZ_DVI_MODE); inv_val |= HDMI_FC_INVIDCONF_R_V_BLANK_IN_OSC_ACTIVE_LOW;