From 8e1ee573b3b7844b74dd6290dbc5f90caaad2528 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Fri, 7 Nov 2008 18:36:00 +0100
Subject: [PATCH] mi: Fix infinite loop on regen when swrast_dri.so is missing

The swrast DRI provider gets pushed on the glx provider stack at every
server generation, so the stack turns into a circular list on regen.

X.Org bug#18388 <https://bugs.freedesktop.org/show_bug.cgi?id=18388>
(cherry picked from commit d3d6be4948fa19947fd3b03e6694247109cc0ffb)
---
 mi/miinitext.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mi/miinitext.c b/mi/miinitext.c
index 55faec333..4f252d41f 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -661,7 +661,8 @@ InitExtensions(argc, argv)
 #endif
 
 #ifdef GLXEXT
-    GlxPushProvider(&__glXDRISWRastProvider);
+    if (serverGeneration == 1)
+	GlxPushProvider(&__glXDRISWRastProvider);
     if (!noGlxExtension) GlxExtensionInit();
 #endif
 }