sna/gen6+: Demote priority of COPY_LAST for copy boxes

Even if we expect to flush at the end of the operation, we still want to
consider semaphores before overriding the engine selection.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/sna/gen6_common.h b/src/sna/gen6_common.h
index 49e241f2..b6197144 100644
--- a/src/sna/gen6_common.h
+++ b/src/sna/gen6_common.h
@@ -49,9 +49,6 @@ inline static bool can_switch_to_blt(struct sna *sna,
 	if (NO_RING_SWITCH(sna))
 		return false;
 
-	if (flags & COPY_LAST)
-		return true;
-
 	if (bo && RQ_IS_BLT(bo->rq))
 		return true;
 
@@ -61,6 +58,9 @@ inline static bool can_switch_to_blt(struct sna *sna,
 	if (bo && RQ_IS_RENDER(bo->rq))
 		return false;
 
+	if (flags & COPY_LAST)
+		return true;
+
 	return kgem_ring_is_idle(&sna->kgem, KGEM_BLT);
 }