diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index d4cf3677..66a2faf7 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1323,7 +1323,9 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
 }
 
 Bool
-drmmode_do_pageflip(ScreenPtr screen, dri_bo *new_front, dri_bo *old_front,
+drmmode_do_pageflip(ScreenPtr screen,
+		    dri_bo *old_front,
+		    dri_bo *new_front,
 		    void *data)
 {
 	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
@@ -1374,7 +1376,6 @@ drmmode_do_pageflip(ScreenPtr screen, dri_bo *new_front, dri_bo *old_front,
 	dri_bo_pin(new_front, 0);
 	dri_bo_unpin(new_front);
 
-	intel->front_buffer = new_front;
 	drmmode->old_fb_id = old_fb_id;
 
 	return TRUE;
diff --git a/src/i830.h b/src/i830.h
index 9e1b4ca2..3a2a620e 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -395,8 +395,7 @@ enum {
 extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
 extern int drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc);
 extern int drmmode_output_dpms_status(xf86OutputPtr output);
-extern Bool drmmode_do_pageflip(ScreenPtr screen, dri_bo *new_front,
-				dri_bo *old_front, void *data);
+extern Bool drmmode_do_pageflip(ScreenPtr screen, dri_bo *old_front, dri_bo *new_front, void *data);
 
 static inline intel_screen_private *
 intel_get_screen_private(ScrnInfoPtr scrn)