summaryrefslogtreecommitdiff
path: root/linux-core/drm_edid.h
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@jbarnes-t61.(none)>2008-06-09 16:20:45 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2008-06-09 16:20:45 -0700
commitc987e76d953b6aecbfb69058fc4c387aa3fb33c9 (patch)
treebe68725a0b569638a97976b4a21ef348c86b6ff1 /linux-core/drm_edid.h
parentc2fc142ea7e9dd651702773efbc9c3366f977aa6 (diff)
Add EDID quirk handling
Port over EDID quirks from X.Org so we can handle more monitors. This meant adding size info to the drm_display_mode struct, but other than that the changes were isolated to the DRM EDID handling code (as they should be).
Diffstat (limited to 'linux-core/drm_edid.h')
-rw-r--r--linux-core/drm_edid.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/linux-core/drm_edid.h b/linux-core/drm_edid.h
index 0d2eeaa1..dccfba91 100644
--- a/linux-core/drm_edid.h
+++ b/linux-core/drm_edid.h
@@ -122,8 +122,8 @@ struct detailed_timing {
struct edid {
u8 header[8];
/* Vendor & product info */
- u16 mfg_id; /* FIXME: byte order */
- u16 prod_code; /* FIXME: byte order */
+ u8 mfg_id[2];
+ u8 prod_code[2];
u32 serial; /* FIXME: byte order */
u8 mfg_week;
u8 mfg_year;
@@ -173,4 +173,6 @@ struct edid {
u8 checksum;
} __attribute__((packed));
+#define EDID_PRODUCT_ID(e) ((e)->prod_code[0] | ((e)->prod_code[1] << 8))
+
#endif /* __DRM_EDID_H__ */