diff options
| author | Jassi Brar <jaswinder.singh@linaro.org> | 2011-06-22 20:40:25 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-06-22 20:40:25 +0100 |
| commit | b393466b014fa5e40ca95ac687bfb0260462db19 (patch) | |
| tree | 23e1197958c2097c77a030ed3b29056b3fced93f | |
| parent | bf7999aeaff7b5a67a6e2ea065f55d19b8607fa6 (diff) | |
Subject: [PATCH 15/19] 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 <jaswinder.singh@linaro.org>
| -rw-r--r-- | 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 d1ca3bc17cb..5e6e6790f64 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c @@ -1206,6 +1206,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 |