summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2013-11-05 21:33:18 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2013-11-06 09:00:33 +0000
commit736b496b458d666416ea94f157c05ce78f98a600 (patch)
treefb2fe9ae763d94f5e70925de19fbc93a5f6f24ad
parent723f17ca4f9c120be5fe667bf2c3e35c7ee687be (diff)
sna: Mark partial move_area_to_gpu with MOVE_READ on promotion to move_to_gpu
When promoting a partial move_area_to_gpu to a full move_to_gpu, we have to disable certain optimisations that we try to use if MOVE_READ==0. Reported-and-tested-by: Matti Hamalainen <ccr@tnsp.org> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71198 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_accel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 2aae0e2f..02b319d7 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -3035,7 +3035,7 @@ sna_pixmap_move_area_to_gpu(PixmapPtr pixmap, const BoxRec *box, unsigned int fl
if (priv->cpu_damage == NULL) {
list_del(&priv->flush_list);
- return sna_pixmap_move_to_gpu(pixmap, flags);
+ return sna_pixmap_move_to_gpu(pixmap, MOVE_READ | flags);
}
if (priv->gpu_bo == NULL) {