Signed-off-by: Torsten Kaiser <x11@ariolc.dyndns.org>

--- a/hw/xfree86/modes/xf86EdidModes.c.orig	2012-02-08 22:00:45.805914457 +0100
+++ b/hw/xfree86/modes/xf86EdidModes.c	2012-02-08 22:02:49.615915120 +0100
@@ -731,6 +731,11 @@
     { 1920, 1200, 85, 0 },
     { 1920, 1440, 60, 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
@@ -740,10 +745,11 @@
     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,