andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Accept EDID > 1.3 but < 2.0 if we find it, assume it's compatible.

Browse Source
This commit is contained in:
Adam Jackson 2006-12-10 11:24:05 -05:00
parent d56249a15e
commit fb8364bca3
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xfree86/ddc/ddcProperty.c
View File

@ -32,9 +32,6 @@
#include "propertyst.h" #include "propertyst.h"
#include "xf86DDC.h" #include "xf86DDC.h"
#define EDID1_ATOM_NAME "XFree86_DDC_EDID1_RAWDATA" #define EDID1_ATOM_NAME "XFree86_DDC_EDID1_RAWDATA"
#define EDID2_ATOM_NAME "XFree86_DDC_EDID2_RAWDATA" #define EDID2_ATOM_NAME "XFree86_DDC_EDID2_RAWDATA"
#define VDIF_ATOM_NAME "XFree86_DDC_VDIF_RAWDATA" #define VDIF_ATOM_NAME "XFree86_DDC_VDIF_RAWDATA"

12
hw/xfree86/ddc/interpret_edid.c
View File

@ -304,16 +304,18 @@ get_detailed_timing_section(Uchar *c, struct detailed_timings *r)
r->misc = MISC; r->misc = MISC;
} }
#define MAX_EDID_MINOR 3
static Bool static Bool
validate_version(int scrnIndex, struct edid_version *r) validate_version(int scrnIndex, struct edid_version *r)
{ {
if (r->version != 1) if (r->version != 1)
return FALSE; return FALSE;
if (r->revision > 3) {
xf86DrvMsg(scrnIndex, X_ERROR,"EDID Version 1.%i not yet supported\n", if (r->revision > MAX_EDID_MINOR)
r->revision); xf86DrvMsg(scrnIndex, X_WARNING,
return FALSE; "Assuming version 1.%d is compatible with 1.%d\n",
} r->revision, MAX_EDID_MINOR);
return TRUE; return TRUE;
} }