diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-09 08:17:19 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-09 08:17:19 +0200 |
| commit | 98fa64178af8ad608e19391053b40b0772466c64 (patch) | |
| tree | 841e3eebe0277bdf98441dd45224c039e069d3b8 /xorg-server/hw/xfree86/modes/xf86EdidModes.c | |
| parent | 405ae9defaaa03d4d305b6264a744107c3dd460d (diff) | |
| parent | c29d91cfd8df084f16d0d2dfa82c3a86f7719a73 (diff) | |
| download | vcxsrv-98fa64178af8ad608e19391053b40b0772466c64.tar.gz vcxsrv-98fa64178af8ad608e19391053b40b0772466c64.tar.bz2 vcxsrv-98fa64178af8ad608e19391053b40b0772466c64.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/include/misc.h
Diffstat (limited to 'xorg-server/hw/xfree86/modes/xf86EdidModes.c')
| -rw-r--r-- | xorg-server/hw/xfree86/modes/xf86EdidModes.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/xorg-server/hw/xfree86/modes/xf86EdidModes.c b/xorg-server/hw/xfree86/modes/xf86EdidModes.c index 8aa82d114..258ada5b4 100644 --- a/xorg-server/hw/xfree86/modes/xf86EdidModes.c +++ b/xorg-server/hw/xfree86/modes/xf86EdidModes.c @@ -723,7 +723,13 @@ static const struct { 1920, 1200, 75, 0}, { 1920, 1200, 85, 0}, { 1920, 1440, 60, 0}, { -1920, 1440, 75, 0},}; + 1920, 1440, 75, 0}, + /* fill up last byte */ + { + 0,0,0,0}, { + 0,0,0,0}, { + 0,0,0,0}, { + 0,0,0,0}, }; static DisplayModePtr DDCModesFromEstIII(unsigned char *est) @@ -732,10 +738,11 @@ DDCModesFromEstIII(unsigned char *est) int i, j, m; for (i = 0; i < 6; i++) { - for (j = 7; j > 0; j--) { + for (j = 7; j >= 0; j--) { if (est[i] & (1 << j)) { m = (i * 8) + (7 - j); - modes = xf86ModesAdd(modes, + if (EstIIIModes[m].w) + modes = xf86ModesAdd(modes, FindDMTMode(EstIIIModes[m].w, EstIIIModes[m].h, EstIIIModes[m].r, |