diff --git a/src/r600_exa.c b/src/r600_exa.c
index 6b6c897..bfad0e7 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -2306,7 +2306,8 @@ R600DrawInit(ScreenPtr pScreen)
 	info->accel_state->exa->UploadToScreen = R600UploadToScreenCS;
 	info->accel_state->exa->DownloadFromScreen = R600DownloadFromScreenCS;
 #if (EXA_VERSION_MAJOR == 2 && EXA_VERSION_MINOR >= 5)
-        info->accel_state->exa->CreatePixmap2 = RADEONEXACreatePixmap2;
+	if (info->allowColorTiling)
+	    info->accel_state->exa->CreatePixmap2 = RADEONEXACreatePixmap2;
 #endif
     } else
 #endif