Patrick Georgi (pgeorgi@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11391
-gerrit
commit 74928b5fbe7e5ea8eb117ad6f7d9826c83466f0f Author: David Hendricks dhendrix@chromium.org Date: Thu Aug 13 15:43:55 2015 -0700
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
Change-Id: I11cc61140d905d70798a7b46db7847f3a1b3c886 Signed-off-by: Patrick Georgi patrick@georgi-clan.de Original-Commit-Id: ace7773623eac57f068ecd50baa9108ce028cf1b Original-Signed-off-by: David Hendricks dhendrix@chromium.org Original-Change-Id: I9e22984a98b1a5f8cd9645b92dc9b87e8d968f01 Original-Reviewed-on: https://chromium-review.googlesource.com/293548 Original-Reviewed-by: Julius Werner jwerner@chromium.org --- 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 a7a9c40..e5bebe3 100644 --- a/src/soc/rockchip/rk3288/hdmi.c +++ b/src/soc/rockchip/rk3288/hdmi.c @@ -788,11 +788,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; }