diff --git a/src/i830_memory.c b/src/i830_memory.c
index 84db0ef..461deb7 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -1346,6 +1346,11 @@ i830_allocate_2d_memory(ScrnInfoPtr pScrn)
 	return FALSE;
     }
 
+    pI830->front_buffer =
+	i830_allocate_framebuffer(pScrn, pI830, &pI830->FbMemBox, FALSE);
+    if (pI830->front_buffer == NULL)
+	return FALSE;
+
     /* Allocate the ring buffer first, so it ends up in stolen mem. */
     i830_allocate_ringbuffer(pScrn);
 
@@ -1402,10 +1407,6 @@ i830_allocate_2d_memory(ScrnInfoPtr pScrn)
 	if (pI830->front_buffer_2 == NULL)
 	    return FALSE;
     }
-    pI830->front_buffer =
-	i830_allocate_framebuffer(pScrn, pI830, &pI830->FbMemBox, FALSE);
-    if (pI830->front_buffer == NULL)
-	return FALSE;
 
 #ifdef I830_USE_EXA
     if (pI830->useEXA) {