Index: dri_util.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/common/dri_util.c,v
retrieving revision 1.29
diff -u -r1.29 dri_util.c
--- dri_util.c	29 Nov 2005 23:01:43 -0000	1.29
+++ dri_util.c	16 Feb 2006 02:52:46 -0000
@@ -827,7 +827,9 @@
 	    (*psp->DriverAPI.DestroyScreen)(psp);
 
 	(void)drmUnmap((drmAddress)psp->pSAREA, SAREA_MAX);
+#if 0
 	(void)drmUnmap((drmAddress)psp->pFB, psp->fbSize);
+#endif
 	_mesa_free(psp->pDevPriv);
 	(void)drmClose(psp->fd);
 	if ( psp->modes != NULL ) {
@@ -854,8 +856,7 @@
  *                    all drivers.
  * \param dri_version Version of the "server-side" DRI.
  * \param drm_version Version of the kernel DRM.
- * \param frame_buffer Data describing the location and layout of the
- *                     framebuffer.
+ * \param private Data describing the private structure
  * \param pSAREA       Pointer the the SAREA.
  * \param fd           Device handle for the DRM.
  * \param internal_api_version  Version of the internal interface between the
@@ -873,7 +874,7 @@
 			 const __DRIversion * ddx_version,
 			 const __DRIversion * dri_version,
 			 const __DRIversion * drm_version,
-			 const __DRIframebuffer * frame_buffer,
+			 const __DRIprivate * private,
 			 drm_sarea_t *pSAREA,
 			 int fd,
 			 int internal_api_version,
@@ -923,14 +924,8 @@
 
     psp->pSAREA = pSAREA;
 
-    psp->pFB = frame_buffer->base;
-    psp->fbSize = frame_buffer->size;
-    psp->fbStride = frame_buffer->stride;
-    psp->fbWidth = frame_buffer->width;
-    psp->fbHeight = frame_buffer->height;
-    psp->devPrivSize = frame_buffer->dev_priv_size;
-    psp->pDevPriv = frame_buffer->dev_priv;
-    psp->fbBPP = psp->fbStride * 8 / frame_buffer->width;
+    psp->devPrivSize = private->dev_priv_size;
+    psp->pDevPriv = private->dev_priv;
 
     psp->fd = fd;
 
Index: dri_util.h
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/common/dri_util.h,v
retrieving revision 1.21
diff -u -r1.21 dri_util.h
--- dri_util.h	29 Nov 2005 23:01:43 -0000	1.21
+++ dri_util.h	16 Feb 2006 02:52:46 -0000
@@ -532,7 +532,7 @@
 extern __DRIscreenPrivate * __driUtilCreateNewScreen( __DRInativeDisplay *dpy,
     int scrn, __DRIscreen *psc, __GLcontextModes * modes,
     const __DRIversion * ddx_version, const __DRIversion * dri_version,
-    const __DRIversion * drm_version, const __DRIframebuffer * frame_buffer,
+    const __DRIversion * drm_version, const __DRIprivate * private,
     drm_sarea_t *pSAREA, int fd, int internal_api_version,
     const struct __DriverAPIRec *driverAPI );