summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2016-04-15 15:16:00 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2016-04-15 15:16:00 +0100
commitbb69256b5270b6ff64a87db4eb308f1cc856679c (patch)
tree82ca093096d4cbc3468d33b43d711ce709d3864c /src
parent0d38419cbeaae5f8b5260e4d4dd9cfa0d2694eae (diff)
sna/gen6: Encourage migration of small BLT operations
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
-rw-r--r--src/sna/gen6_common.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sna/gen6_common.h b/src/sna/gen6_common.h
index 898cda80..83adc7d7 100644
--- a/src/sna/gen6_common.h
+++ b/src/sna/gen6_common.h
@@ -46,9 +46,6 @@ inline static bool can_switch_to_blt(struct sna *sna,
if (sna->kgem.ring != KGEM_RENDER)
return true;
- if (NO_RING_SWITCH(sna))
- return false;
-
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 (NO_RING_SWITCH(sna))
+ return false;
+
if (flags & COPY_LAST)
return true;
@@ -207,7 +207,7 @@ prefer_blt_fill(struct sna *sna, struct kgem_bo *bo, unsigned flags)
if (!prefer_blt_ring(sna, bo, 0))
return false;
} else {
- if (can_switch_to_blt(sna, bo, 0))
+ if (can_switch_to_blt(sna, bo, COPY_LAST))
return true;
}