Update to xserver 1.5.3 + latests commits on server-1.5-branch.

tested by stsp@, david@, form@, ckuethe@, oga@. thanks.

2 files changed, 8 insertions, 1 deletions

diff --git a/xserver/mi/mieq.c b/xserver/mi/mieq.c
index aaa247d6c..803724708 100644
--- a/xserver/mi/mieq.c
+++ b/xserver/mi/mieq.c
@@ -145,6 +145,7 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
 	oldtail = (oldtail - 1) % QUEUE_SIZE;
     }
     else {
+	static int stuck = 0;
 	newtail = (oldtail + 1) % QUEUE_SIZE;
 	/* Toss events which come in late.  Usually this means your server's
          * stuck in an infinite loop somewhere, but SIGIO is still getting
@@ -152,8 +153,13 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
 	if (newtail == miEventQueue.head) {
             ErrorF("[mi] EQ overflowing. The server is probably stuck "
                    "in an infinite loop.\n");
+	    if (!stuck) {
+		xorg_backtrace();
+		stuck = 1;
+	    }
 	    return;
         }
+	stuck = 0;
 	miEventQueue.tail = newtail;
     }
 
diff --git a/xserver/mi/miinitext.c b/xserver/mi/miinitext.c
index 55faec333..4f252d41f 100644
--- a/xserver/mi/miinitext.c
+++ b/xserver/mi/miinitext.c
@@ -661,7 +661,8 @@ InitExtensions(argc, argv)
 #endif
 
 #ifdef GLXEXT
-    GlxPushProvider(&__glXDRISWRastProvider);
+    if (serverGeneration == 1)
+	GlxPushProvider(&__glXDRISWRastProvider);
     if (!noGlxExtension) GlxExtensionInit();
 #endif
 }