summaryrefslogtreecommitdiff
path: root/drivers/video/fbmon.c
diff options
context:
space:
mode:
authorErik Gilling <konkers@android.com>2011-02-06 19:32:17 -0800
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:37:13 -0800
commit949e796a5a1ea149540adf576e2a11aa17712902 (patch)
treed08ef9c320167de3ce13ade9804358b449728972 /drivers/video/fbmon.c
parent1943fcae396cd22f86942171298d6fd7485bb123 (diff)
video: fbmon: add HDMI dectetion to fbmod edid parsing
Looks for ieee registration number 0x000c03 as per HDMI spec. CEA-861-E section D.6.8. Change-Id: I6875b24c66e8754510edabcb4f9ba682a50d6ac1 Signed-off-by: Erik Gilling <konkers@android.com> Signed-off-by: Lajos Molnar <molnar@ti.com>
Diffstat (limited to 'drivers/video/fbmon.c')
-rw-r--r--drivers/video/fbmon.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
index d10391972f7e..08ae0da08075 100644
--- a/drivers/video/fbmon.c
+++ b/drivers/video/fbmon.c
@@ -1011,13 +1011,20 @@ void fb_edid_add_monspecs(unsigned char *edid, struct fb_monspecs *specs)
while (pos < edid[2]) {
u8 len = edid[pos] & 0x1f, type = (edid[pos] >> 5) & 7;
pr_debug("Data block %u of %u bytes\n", type, len);
- if (type == 2)
+ if (type == 2) {
for (i = pos; i < pos + len; i++) {
u8 idx = edid[pos + i] & 0x7f;
svd[svd_n++] = idx;
pr_debug("N%sative mode #%d\n",
edid[pos + i] & 0x80 ? "" : "on-n", idx);
}
+ } else if (type == 3 && len >= 3) {
+ u32 ieee_reg = edid[pos + 1] | (edid[pos + 2] << 8) |
+ (edid[pos + 3] << 16);
+ if (ieee_reg == 0x000c03)
+ specs->misc |= FB_MISC_HDMI;
+ }
+
pos += len + 1;
}