sna: Jump to the right escape target when bypassing a self-copy
authorChris Wilson <chris@chris-wilson.co.uk>
Sat, 2 Nov 2013 21:01:26 +0000 (21:01 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Sat, 2 Nov 2013 21:09:01 +0000 (21:09 +0000)
Another fix for

commit e3f15cbf39696edae9f716bdcfbb7032ec7d7e3f [2.99.905]
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Tue Oct 22 15:19:15 2013 +0100

    sna: Move gc back to GPU after failure to move it to CPU

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
src/sna/sna_accel.c

index 02caf4b..d302848 100644 (file)
@@ -5091,7 +5091,7 @@ sna_self_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr gc,
                assert(priv->gpu_bo);
 
                if (alu == GXcopy && priv->clear)
-                       goto out;
+                       goto free_boxes;
 
                assert(priv->gpu_bo->proxy == NULL);
                if (!sna_pixmap_move_to_gpu(pixmap, MOVE_WRITE | MOVE_READ | MOVE_ASYNC_HINT)) {