--- xc/programs/Xserver/GL/dri/dri.c.disable-dri-option	2004-07-30 16:38:27.000000000 -0400
+++ xc/programs/Xserver/GL/dri/dri.c	2004-10-13 15:28:25.818543628 -0400
@@ -71,6 +71,8 @@
 extern Bool noPanoramiXExtension;
 #endif
 
+extern Bool noXFree86DRIExtension;
+
 static int DRIScreenPrivIndex = -1;
 static int DRIWindowPrivIndex = -1;
 static unsigned long DRIGeneration = 0;
@@ -129,6 +131,13 @@
 	DRIGeneration = serverGeneration;
     }
 
+    /* If the DRI extension is disabled, do not initialize the DRI */
+    if (noXFree86DRIExtension) {
+	DRIDrvMsg(pScreen->myNum, X_WARNING,
+		  "Direct rendering has been disabled.\n");
+	return FALSE;
+    }
+
     /*
      * If Xinerama is on, don't allow DRI to initialise.  It won't be usable
      * anyway.