diff --git a/src/i830_exa.c b/src/i830_exa.c
index fd29df1..9002711 100644
--- a/src/i830_exa.c
+++ b/src/i830_exa.c
@@ -767,8 +767,11 @@ i830_uxa_prepare_access (PixmapPtr pixmap, uxa_access_t access)
 	    I830Sync(scrn);
 	    i830->need_sync = FALSE;
 	}
-	if (dri_bo_map (bo, access == UXA_ACCESS_RW) != 0)
+	if (dri_gem_bo_map_gtt(bo, 4096)) {
+	    xf86DrvMsg(scrn->scrnIndex, X_WARNING, "%s: bo map failed\n",
+		       __FUNCTION__);
 	    return FALSE;
+	}
         pixmap->devPrivate.ptr = bo->virtual;
     }
     return TRUE;
@@ -798,7 +801,7 @@ i830_uxa_block_handler (ScreenPtr screen)
     I830Ptr i830 = I830PTR(scrn);
 
     if (i830->need_flush) {
-	dri_bo_wait_rendering (i830->front_buffer->bo);
+//	dri_bo_wait_rendering (i830->front_buffer->bo);
 	i830->need_flush = FALSE;
     }
 }