From 5074ce2985eba858e4482a45d18b91800b0e85d6 Mon Sep 17 00:00:00 2001 From: Jassi Brar Date: Tue, 31 May 2011 01:26:26 +0530 Subject: [PATCH] OMAP2: HDMI: Assume EDID read success as detection Some class of hdmi displays never make the bit(2) of HDMI_CORE_SYS_SYS_STAT set. EDID is read before calls to is_detected callback, so if reading EDID succeeded that implies we do have HDMI connected. In that case skip reading/waiting on the second bit. Signed-off-by: Jassi Brar --- drivers/video/omap2/dss/hdmi.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index a764662..dc809c4 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c @@ -1104,6 +1104,10 @@ bool omapdss_hdmi_is_detected(struct omap_dss_device *dssdev, bool force) { u32 r; + /* If EDID has already been read, we have HDMI connected */ + if (hdmi.edid_set) + return true; + r = hdmi_read_reg(HDMI_CORE_SYS_SYS_STAT); /* Some annoying LG monitors will report that's disconnected -- 1.7.4.1