From 8c65d46c7a387b3532a98b68b437d359424e61fe Mon Sep 17 00:00:00 2001 From: David Hendricks Date: Thu, 13 Aug 2015 15:43:55 -0700 Subject: [PATCH] rk3288: Ignore EDID errors for HDMI Assume that HDMI implies usage of an external display, and that we want to try bringing up display if we can read an EDID. BUG=chrome-os-partner:42946 BRANCH=firmware-veyron TEST=none; need a display with corrupt EDID to test with Signed-off-by: David Hendricks Change-Id: I9e22984a98b1a5f8cd9645b92dc9b87e8d968f01 Reviewed-on: https://chromium-review.googlesource.com/293608 --- 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 ada14bd179..c7cb2cbfef 100644 --- a/src/soc/rockchip/rk3288/hdmi.c +++ b/src/soc/rockchip/rk3288/hdmi.c @@ -789,11 +789,10 @@ int rk_hdmi_get_edid(struct edid *edid) edid_size += HDMI_EDID_BLOCK_SIZE; } - ret = decode_edid(edid_buf, edid_size, edid); - if (ret) { + /* Assume usage of HDMI implies an external display in which case + * we should be lenient about errors that the EDID decoder finds. */ + if (decode_edid(edid_buf, edid_size, edid)) hdmi_debug("failed to decode edid.\n"); - return -1; - } return 0; }