--- a/src/i830_memory.c	2009-08-09 12:44:05.427536515 +0200
+++ b/src/i830_memory.c	2009-08-09 13:15:47.767852816 +0200
@@ -468,6 +468,11 @@
 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		       "Failed to allocate space for kernel memory manager\n");
 	}
+    } else {
+      if (!pI830->bufmgr) {
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "BUFMGR is missing!\n");
+        i830_init_bufmgr(pScrn);
+      }
     }
 
     return TRUE;