diff -Naur src/intel_display.c.old src/intel_display.c
--- src/intel_display.c.old	2010-08-03 14:46:42.973000053 +0200
+++ src/intel_display.c	2010-08-03 14:49:06.727000047 +0200
@@ -1528,7 +1528,7 @@
 	if (has_flipping) {
 		xf86DrvMsg(scrn->scrnIndex, X_INFO,
 			   "Kernel page flipping support detected, enabling\n");
-		intel->use_pageflipping = TRUE;
+		intel->use_pageflipping = FALSE;
 		mode->flip_count = 0;
 		mode->event_context.version = DRM_EVENT_CONTEXT_VERSION;
 		mode->event_context.vblank_handler = intel_vblank_handler;
diff -Naur src/intel_dri.c.old src/intel_dri.c
--- src/intel_dri.c.old	2010-08-03 14:46:42.963000071 +0200
+++ src/intel_dri.c	2010-08-03 14:49:49.615000083 +0200
@@ -1056,7 +1056,7 @@
 
 	info.CopyRegion = I830DRI2CopyRegion;
 #if DRI2INFOREC_VERSION >= 4
-	if (intel->use_pageflipping) {
+	if (intel->use_pageflipping || 1) {
 	    info.version = 4;
 	    info.ScheduleSwap = I830DRI2ScheduleSwap;
 	    info.GetMSC = I830DRI2GetMSC;