diff options
| author | Erik Gilling <konkers@android.com> | 2011-11-09 14:18:46 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:37:12 -0800 |
| commit | ec3038e4888abb61e42754c5a6e4b466792ab032 (patch) | |
| tree | c0160f0e42b4887623e1385f60109c36dd8d339f | |
| parent | 06483276516d043b568054d63b658f616d12e368 (diff) | |
Revert "video: fbmon: add HDMI dectetion to fbmod edid parsing"
This reverts commit c326f06779fb6bdd7f92c3ede8d1bebbe2fafbfa.
| -rw-r--r-- | drivers/video/fbmon.c | 11 | ||||
| -rw-r--r-- | include/linux/fb.h | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c index c648562b8bc4..4f57485f8c54 100644 --- a/drivers/video/fbmon.c +++ b/drivers/video/fbmon.c @@ -1001,22 +1001,13 @@ 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 == 0x3) { - if (len >= 3) { - u32 ieee_reg = edid[pos] | - (edid[pos + 1] << 8) | - (edid[pos + 2] << 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 611955110f77..1d6836c498dd 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -439,8 +439,6 @@ 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; |