diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 9f274619..e0f804e6 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -4737,7 +4737,9 @@ void kgem_bo_sync__cpu(struct kgem *kgem, struct kgem_bo *bo)
 void kgem_bo_sync__cpu_full(struct kgem *kgem, struct kgem_bo *bo, bool write)
 {
 	assert(bo->proxy == NULL);
-	kgem_bo_submit(kgem, bo);
+
+	if (write || bo->needs_flush)
+		kgem_bo_submit(kgem, bo);
 
 	if (bo->domain != DOMAIN_CPU) {
 		struct drm_i915_gem_set_domain set_domain;
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 134b72fc..12f078eb 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -4138,17 +4138,14 @@ static bool use_shm_bo(struct sna *sna,
 		DBG(("%s: yes, complex alu=%d\n", __FUNCTION__, alu));
 		return true;
 	}
-	if (bo->tiling) {
-		DBG(("%s:, yes, dst tiled=%d\n", __FUNCTION__, bo->tiling));
-		return true;
-	}
 
 	if (__kgem_bo_is_busy(&sna->kgem, bo)) {
 		DBG(("%s: yes, dst is busy\n", __FUNCTION__));
 		return true;
 	}
 
-	if (__kgem_bo_is_busy(&sna->kgem, priv->cpu_bo)) {
+	if (priv->cpu_bo->needs_flush &&
+	    __kgem_bo_is_busy(&sna->kgem, priv->cpu_bo)) {
 		DBG(("%s: yes, src is busy\n", __FUNCTION__));
 		return true;
 	}
@@ -4378,8 +4375,7 @@ sna_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr gc,
 		    src_priv == NULL &&
 		    sna->kgem.has_userptr &&
 		    box_inplace(src_pixmap, &region->extents) &&
-		    ((sna->kgem.has_llc && bo->tiling && !bo->scanout) ||
-		     __kgem_bo_is_busy(&sna->kgem, bo))) {
+		     __kgem_bo_is_busy(&sna->kgem, bo)) {
 			struct kgem_bo *src_bo;
 			bool ok = false;