diff --git a/src/mesa/drivers/dri/intel/intel_buffers.c b/src/mesa/drivers/dri/intel/intel_buffers.c
index 2a25f07..4ef272f 100644
--- a/src/mesa/drivers/dri/intel/intel_buffers.c
+++ b/src/mesa/drivers/dri/intel/intel_buffers.c
@@ -345,7 +345,7 @@ intelWindowMoved(struct intel_context *intel)
 	 if ( dPriv->vblFlags & VBLANK_FLAG_SECONDARY ) {
 	    vbl.request.type |= DRM_VBLANK_SECONDARY;
 	 }
-
+#ifdef I915
 	 for (i = 0; i < intel_fb->pf_num_pages; i++) {
 	    if (!intel_fb->color_rb[i] ||
 		(intel_fb->vbl_waited - intel_fb->color_rb[i]->vbl_pending) <=
@@ -355,7 +355,7 @@ intelWindowMoved(struct intel_context *intel)
 	    vbl.request.sequence = intel_fb->color_rb[i]->vbl_pending;
 	    drmWaitVBlank(intel->driFd, &vbl);
 	 }
-
+#endif
 	 /*
 	  * Update msc_base from old pipe
 	  */
@@ -369,11 +369,12 @@ intelWindowMoved(struct intel_context *intel)
 	 dPriv->vblank_base = dPriv->vblSeq;
 
 	 intel_fb->vbl_waited = dPriv->vblSeq;
-
+#ifdef I915
 	 for (i = 0; i < intel_fb->pf_num_pages; i++) {
 	    if (intel_fb->color_rb[i])
 	       intel_fb->color_rb[i]->vbl_pending = intel_fb->vbl_waited;
 	 }
+#endif
       }
    } else {
       dPriv->vblFlags &= ~VBLANK_FLAG_SECONDARY;
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 671b3f6..ec89f35 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -960,7 +960,7 @@ void LOCK_HARDWARE( struct intel_context *intel )
 	     intel_get_renderbuffer(&intel_fb->Base,
 				    intel_fb->Base._ColorDrawBufferIndexes[0]);
     }
-
+#ifdef I915
     if (intel_rb && dPriv->vblFlags &&
 	!(dPriv->vblFlags & VBLANK_FLAG_NO_IRQ) &&
 	(intel_fb->vbl_waited - intel_rb->vbl_pending) > (1<<23)) {
@@ -976,7 +976,7 @@ void LOCK_HARDWARE( struct intel_context *intel )
 	drmWaitVBlank(intel->driFd, &vbl);
 	intel_fb->vbl_waited = vbl.reply.sequence;
     }
-
+#endif
     DRM_CAS(intel->driHwLock, intel->hHWContext,
         (DRM_LOCK_HELD|intel->hHWContext), __ret);