diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index a95490df..9cde9492 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1090,7 +1090,8 @@ _sna_drawable_use_gpu_bo(DrawablePtr drawable,
 	if (priv == NULL)
 		return FALSE;
 
-	if (pixmap->devPrivate.ptr == NULL &&
+	if (priv->cpu_damage == NULL &&
+	    sna_pixmap_choose_tiling(pixmap) != I915_TILING_NONE &&
 	    !sna_pixmap_move_to_gpu(pixmap, MOVE_READ | MOVE_WRITE))
 		return FALSE;