xserver: Branch 'master'
Adam Jackson
ajax at kemper.freedesktop.org
Sun Dec 10 18:28:11 EET 2006
hw/xfree86/ddc/ddcProperty.c | 3 ---
hw/xfree86/ddc/interpret_edid.c | 12 +++++++-----
2 files changed, 7 insertions(+), 8 deletions(-)
New commits:
diff-tree fb8364bca30fe9268e807b0a9a3ebf875ee1fce2 (from d56249a15ead51ad4d2117d5538ada24af05b693)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date: Sun Dec 10 11:24:05 2006 -0500
Accept EDID > 1.3 but < 2.0 if we find it, assume it's compatible.
diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c
index 11b5e26..13083dd 100644
--- a/hw/xfree86/ddc/ddcProperty.c
+++ b/hw/xfree86/ddc/ddcProperty.c
@@ -32,9 +32,6 @@
#include "propertyst.h"
#include "xf86DDC.h"
-
-
-
#define EDID1_ATOM_NAME "XFree86_DDC_EDID1_RAWDATA"
#define EDID2_ATOM_NAME "XFree86_DDC_EDID2_RAWDATA"
#define VDIF_ATOM_NAME "XFree86_DDC_VDIF_RAWDATA"
diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c
index c58bb2f..7b4b2b9 100644
--- a/hw/xfree86/ddc/interpret_edid.c
+++ b/hw/xfree86/ddc/interpret_edid.c
@@ -304,16 +304,18 @@ get_detailed_timing_section(Uchar *c, st
r->misc = MISC;
}
+#define MAX_EDID_MINOR 3
static Bool
validate_version(int scrnIndex, struct edid_version *r)
{
if (r->version != 1)
return FALSE;
- if (r->revision > 3) {
- xf86DrvMsg(scrnIndex, X_ERROR,"EDID Version 1.%i not yet supported\n",
- r->revision);
- return FALSE;
- }
+
+ if (r->revision > MAX_EDID_MINOR)
+ xf86DrvMsg(scrnIndex, X_WARNING,
+ "Assuming version 1.%d is compatible with 1.%d\n",
+ r->revision, MAX_EDID_MINOR);
+
return TRUE;
}
More information about the xorg-commit
mailing list