diff --git a/src/mesa/drivers/dri/intel/intel_buffers.c b/src/mesa/drivers/dri/intel/intel_buffers.c
index 2a25f07..a124ac6 100644
--- a/src/mesa/drivers/dri/intel/intel_buffers.c
+++ b/src/mesa/drivers/dri/intel/intel_buffers.c
@@ -197,7 +197,6 @@ intelSetBackClipRects(struct intel_context *intel)
    }
 }
 
-#ifdef I915
 static void
 intelUpdatePageFlipping(struct intel_context *intel,
 			GLint areaA, GLint areaB)
@@ -223,7 +222,7 @@ intelUpdatePageFlipping(struct intel_context *intel,
 
    pf_active = pf_planes && (pf_planes & intel->sarea->pf_active) == pf_planes;
 
-   if (INTEL_DEBUG & DEBUG_LOCK)
+   if (1 || INTEL_DEBUG & DEBUG_LOCK)
       if (pf_active != intel_fb->pf_active)
 	 _mesa_printf("%s - Page flipping %sactive\n", __progname,
 		      pf_active ? "" : "in");
@@ -267,7 +266,6 @@ intelUpdatePageFlipping(struct intel_context *intel,
    intel_flip_renderbuffers(intel_fb);
    intel_draw_buffer(&intel->ctx, intel->ctx.DrawBuffer);
 }
-#endif /* I915 */
 
 /**
  * This will be called whenever the currently bound window is moved/resized.
@@ -318,9 +316,7 @@ intelWindowMoved(struct intel_context *intel)
       GLint areaB = driIntersectArea( drw_rect, planeB_rect );
       GLuint flags = dPriv->vblFlags;
 
-#ifdef I915
       intelUpdatePageFlipping(intel, areaA, areaB);
-#endif
 
       /* Update vblank info
        */
@@ -645,7 +641,6 @@ intel_wait_flips(struct intel_context *intel)
 static GLboolean
 intelPageFlip(const __DRIdrawablePrivate * dPriv)
 {
-#ifdef I915
    struct intel_context *intel;
    int ret;
    struct intel_framebuffer *intel_fb = dPriv->driverPrivate;
@@ -698,9 +693,6 @@ intelPageFlip(const __DRIdrawablePrivate * dPriv)
    intel_draw_buffer(&intel->ctx, &intel_fb->Base);
 
    return GL_TRUE;
-#else
-   return GL_FALSE;
-#endif
 }
 
 #if 0
@@ -746,8 +738,10 @@ intelScheduleSwap(__DRIdrawablePrivate * dPriv, GLboolean *missed_target)
 
    if (!dPriv->vblFlags ||
        (dPriv->vblFlags & VBLANK_FLAG_NO_IRQ) ||
-       intelScreen->drmMinor < (intel_fb->pf_active ? 9 : 6))
+       intelScreen->drmMinor < (intel_fb->pf_active ? 9 : 6)) {
+	   printf("swap schedule failed: bad flags or drm minor\n");
       return GL_FALSE;
+   }
 
    interval = driGetVBlankInterval(dPriv);
 
@@ -756,6 +750,7 @@ intelScheduleSwap(__DRIdrawablePrivate * dPriv, GLboolean *missed_target)
    if (dPriv->vblFlags & VBLANK_FLAG_SYNC) {
       swap.seqtype |= DRM_VBLANK_NEXTONMISS;
    } else if (interval == 0) {
+	   printf("swap schedule failed: bad interval\n");
       return GL_FALSE;
    }
 
@@ -803,6 +798,7 @@ intelScheduleSwap(__DRIdrawablePrivate * dPriv, GLboolean *missed_target)
       }
 
       ret = GL_FALSE;
+      printf("swap schedule failed: vblank swap failed\n");
    }
 
    UNLOCK_HARDWARE(intel);
@@ -832,6 +828,7 @@ intelSwapBuffers(__DRIdrawablePrivate * dPriv)
 	 _mesa_notifySwapBuffers(ctx);  /* flush pending rendering comands */
 
          if (!intelScheduleSwap(dPriv, &missed_target)) {
+		 printf("schedule swap failed, trying to wait manually\n");
 	    driWaitForVBlank(dPriv, &missed_target);
 
 	    if (!intelPageFlip(dPriv)) {