diff options
| -rw-r--r-- | drivers/video/fbmon.c | 9 | ||||
| -rw-r--r-- | include/linux/fb.h | 2 |
2 files changed, 10 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; } diff --git a/include/linux/fb.h b/include/linux/fb.h index 0edb305b22db..f0532fca9cff 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -443,6 +443,8 @@ struct file; #define FB_MISC_PRIM_COLOR 1 #define FB_MISC_1ST_DETAIL 2 /* First Detailed Timing is preferred */ +#define FB_MISC_HDMI 4 /* display supports HDMI signaling */ + struct fb_chroma { __u32 redx; /* in fraction of 1024 */ __u32 greenx; |