summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-08-20 22:09:54 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-08-20 23:18:10 +0100
commit6aabe90587f4916a01a1cd2bbc577a1e7fa20eca (patch)
tree3282adf7700aa453126bccbe0788031c56d3ae9a
parent1a4b6fea7b1516de35e6800efa5b85f8401a5b2a (diff)
sna: Allow target bo promotion to GPU even on old architectures
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_accel.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index f5306030..9fda8cad 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -2551,9 +2551,6 @@ use_cpu_bo:
if (priv->cpu_bo == NULL)
return NULL;
- if (!to_sna_from_pixmap(pixmap)->kgem.can_blt_cpu)
- return NULL;
-
if ((flags & FORCE_GPU) == 0 && !kgem_bo_is_busy(priv->cpu_bo))
return NULL;
@@ -2578,6 +2575,9 @@ use_cpu_bo:
goto move_to_gpu;
}
+ if (!to_sna_from_pixmap(pixmap)->kgem.can_blt_cpu)
+ return NULL;
+
if (!sna_drawable_move_region_to_cpu(&pixmap->drawable, &region,
MOVE_READ | MOVE_ASYNC_HINT)) {
DBG(("%s: failed to move-to-cpu, fallback\n", __FUNCTION__));