diff --git a/src/i830_exa.c b/src/i830_exa.c
index 0e9cd5b..4ae235b 100644
--- a/src/i830_exa.c
+++ b/src/i830_exa.c
@@ -542,7 +542,7 @@ I830EXAInit(ScreenPtr pScreen)
    	pI830->EXADriverPtr->PrepareComposite = i915_prepare_composite;
     	pI830->EXADriverPtr->Composite = i830_composite;
     	pI830->EXADriverPtr->DoneComposite = i830_done_composite;
-    } else {
+    } else if (!pI830->tiling) {
  	pI830->EXADriverPtr->CheckComposite = i965_check_composite;
  	pI830->EXADriverPtr->PrepareComposite = i965_prepare_composite;
  	pI830->EXADriverPtr->Composite = i965_composite;