Index: i810screen.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/i810/i810screen.c,v
retrieving revision 1.24
diff -u -r1.24 i810screen.c
--- i810screen.c	4 Sep 2005 22:13:42 -0000	1.24
+++ i810screen.c	16 Feb 2006 02:33:05 -0000
@@ -268,6 +268,19 @@
       return GL_FALSE;
    }
 
+   i810Screen->front.handle = gDRIPriv->frontbuffer;
+   i810Screen->front.size = gDRIPriv->frontbufferSize;
+
+   if (drmMap(sPriv->fd,
+	      i810Screen->front.handle,
+	      i810Screen->front.size,
+	      (drmAddress *)&i810Screen->front.map) != 0) {
+      FREE(i810Screen);
+      sPriv->private = NULL;
+      __driUtilMessage("i810InitDriver: drmMap failed");
+      return GL_FALSE;
+   }
+
    i810Screen->back.handle = gDRIPriv->backbuffer;
    i810Screen->back.size = gDRIPriv->backbufferSize;
 
@@ -351,7 +364,7 @@
       {
          driRenderbuffer *frontRb
             = driNewRenderbuffer(GL_RGBA,
-                                 driScrnPriv->pFB,
+                                 screen->front.map,
                                  screen->cpp,
                                  /*screen->frontOffset*/0, screen->backPitch,
                                  driDrawPriv);
@@ -431,12 +444,12 @@
  *         failure.
  */
 PUBLIC
-void * __driCreateNewScreen_20050727( __DRInativeDisplay *dpy, int scrn, __DRIscreen *psc,
+void * __driCreateNewScreen_20060227( __DRInativeDisplay *dpy, int scrn, __DRIscreen *psc,
 			     const __GLcontextModes * modes,
 			     const __DRIversion * ddx_version,
 			     const __DRIversion * dri_version,
 			     const __DRIversion * drm_version,
-			     const __DRIframebuffer * frame_buffer,
+			     const __DRIprivate * private,
 			     drmAddress pSAREA, int fd,
 			     int internal_api_version,
 			     const __DRIinterfaceMethods * interface,
@@ -459,7 +472,7 @@
 
    psp = __driUtilCreateNewScreen(dpy, scrn, psc, NULL,
 				  ddx_version, dri_version, drm_version,
-				  frame_buffer, pSAREA, fd,
+				  private, pSAREA, fd,
 				  internal_api_version, &i810API);
    if ( psp != NULL ) {
       *driver_modes = i810FillInModes( 16,
Index: server/i810_dri.h
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/i810/server/i810_dri.h,v
retrieving revision 1.6
diff -u -r1.6 i810_dri.h
--- server/i810_dri.h	15 Aug 2005 06:59:24 -0000	1.6
+++ server/i810_dri.h	16 Feb 2006 02:33:05 -0000
@@ -12,6 +12,9 @@
    drm_handle_t regs;
    drmSize regsSize;
 
+   drmSize frontbufferSize;
+   drm_handle_t frontbuffer;
+
    drmSize backbufferSize;
    drm_handle_t backbuffer;