[PATCH/RFC,109/390] drm/edid: Update range descriptor struct for EDID 1.4

Commit Message

Simon Horman March 29, 2013, 2:40 a.m. UTC

From: Adam Jackson <[e-mail]>

Signed-off-by: Adam Jackson <[e-mail]>
Tested-by: Takashi Iwai <[e-mail]>
Reviewed-by: Rodrigo Vivi <[e-mail]>
Signed-off-by: Dave Airlie <[e-mail]>
(cherry picked from commit eeefa4bea1af34207c5299f989fffe03628ea164)

Signed-off-by: Simon Horman <[e-mail]>
---
 include/drm/drm_edid.h |   26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

Patch

diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index bcb9a66..8cefbbe 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -90,12 +90,26 @@  struct detailed_data_monitor_range {
 	u8 min_hfreq_khz;
 	u8 max_hfreq_khz;
 	u8 pixel_clock_mhz; /* need to multiply by 10 */
-	__le16 sec_gtf_toggle; /* A000=use above, 20=use below */
-	u8 hfreq_start_khz; /* need to multiply by 2 */
-	u8 c; /* need to divide by 2 */
-	__le16 m;
-	u8 k;
-	u8 j; /* need to divide by 2 */
+	u8 flags;
+	union {
+		struct {
+			u8 reserved;
+			u8 hfreq_start_khz; /* need to multiply by 2 */
+			u8 c; /* need to divide by 2 */
+			__le16 m;
+			u8 k;
+			u8 j; /* need to divide by 2 */
+		} gtf2;
+		struct {
+			u8 version;
+			u8 data1; /* high 6 bits: extra clock resolution */
+			u8 data2; /* plus low 2 of above: max hactive */
+			u8 supported_aspects;
+			u8 flags; /* preferred aspect and blanking support */
+			u8 supported_scalings;
+			u8 preferred_refresh;
+		} cvt;
+	} formula;
 } __attribute__((packed));
 
 struct detailed_data_wpindex {