Index: dri.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/dri/dri.c,v
retrieving revision 1.17
diff -u -r1.17 dri.c
--- dri.c	6 Jan 2006 18:06:02 -0000	1.17
+++ dri.c	16 Feb 2006 02:28:31 -0000
@@ -298,24 +298,6 @@
     DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] mapped SAREA %p to %p\n",
 	      pDRIPriv->hSAREA, pDRIPriv->pSAREA);
 
-    if (drmAddMap( pDRIPriv->drmFD,
-		   (drm_handle_t)pDRIPriv->pDriverInfo->frameBufferPhysicalAddress,
-		   pDRIPriv->pDriverInfo->frameBufferSize,
-		   DRM_FRAME_BUFFER,
-		   0,
-		   &pDRIPriv->hFrameBuffer) < 0)
-    {
-	pDRIPriv->directRenderingSupport = FALSE;
-	pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL;
-	drmUnmap(pDRIPriv->pSAREA, pDRIPriv->pDriverInfo->SAREASize);
-	drmClose(pDRIPriv->drmFD);
-        DRIDrvMsg(pScreen->myNum, X_INFO,
-                  "[drm] drmAddMap failed\n");
-	return FALSE;
-    }
-    DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] framebuffer handle = %p\n",
-	      pDRIPriv->hFrameBuffer);
-
 				/* Add tags for reserved contexts */
     if ((reserved = drmGetReservedContextList(pDRIPriv->drmFD,
 					      &reserved_count))) {
@@ -1294,13 +1276,15 @@
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
-    *hFrameBuffer = pDRIPriv->hFrameBuffer;
-    *fbOrigin = 0;
-    *fbSize = pDRIPriv->pDriverInfo->frameBufferSize;
-    *fbStride = pDRIPriv->pDriverInfo->frameBufferStride;
     *devPrivateSize = pDRIPriv->pDriverInfo->devPrivateSize;
     *pDevPrivate = pDRIPriv->pDriverInfo->devPrivate;
 
+    /* no longer used */
+    *hFrameBuffer = 0; 
+    *fbOrigin = 0;
+    *fbSize = 0;
+    *fbStride = 0;
+
     return TRUE;
 }
 
Index: dri.h
===================================================================
RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/dri/dri.h,v
retrieving revision 1.8
diff -u -r1.8 dri.h
--- dri.h	24 Sep 2005 18:45:45 -0000	1.8
+++ dri.h	16 Feb 2006 02:28:31 -0000
@@ -105,9 +105,10 @@
  * 4.1.0 and earlier: DRIQueryVersion returns XF86DRI_*_VERSION.
  * 4.2.0: DRIQueryVersion begins returning DRIINFO_*_VERSION.
  * 5.0.0: frameBufferPhysicalAddress changed from CARD32 to pointer.
+ * 6.0.0: frameBuffer is no longer mapped by libdri.
  */
 
-#define DRIINFO_MAJOR_VERSION   5
+#define DRIINFO_MAJOR_VERSION   6
 #define DRIINFO_MINOR_VERSION   0
 #define DRIINFO_PATCH_VERSION   0
 
Index: xf86dri.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/dri/xf86dri.c,v
retrieving revision 1.13
diff -u -r1.13 xf86dri.c
--- xf86dri.c	18 Nov 2005 23:34:04 -0000	1.13
+++ xf86dri.c	16 Feb 2006 02:28:32 -0000
@@ -525,7 +525,7 @@
 )
 {
     xXF86DRIGetDeviceInfoReply	rep;
-    drm_handle_t hFrameBuffer;
+    drm_handle_t junk;
     void *pDevPrivate;
 
     REQUEST(xXF86DRIGetDeviceInfoReq);
@@ -540,7 +540,7 @@
     rep.sequenceNumber = client->sequence;
 
     if (!DRIGetDeviceInfo( screenInfo.screens[stuff->screen],
-			   &hFrameBuffer,
+			   &junk,
 			   (int*)&rep.framebufferOrigin,
 			   (int*)&rep.framebufferSize,
 			   (int*)&rep.framebufferStride,
@@ -549,12 +549,9 @@
 	return BadValue;
     }
 
-    rep.hFrameBufferLow  = (CARD32)(hFrameBuffer & 0xffffffff);
-#if defined(LONG64) && !defined(__linux__)
-    rep.hFrameBufferHigh = (CARD32)(hFrameBuffer >> 32);
-#else
+    /* no longer used */
     rep.hFrameBufferHigh = 0;
-#endif
+    rep.hFrameBufferLow = 0;
 
     rep.length = 0;
     if (rep.devPrivateSize) {