summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2015-03-07 21:09:39 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2015-03-07 21:18:45 +0000
commitf7c4bc7c5f5a194e1794644c0641eb735f97b297 (patch)
tree7757ce38203d6bc6d9f88201bcc971035c6b350e /src
parentaefedd2baff8beaa5a5548bcf7a126ab6fca310b (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/sna/gen6_common.h6
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);
}