From 56e3761dec7ea3fc35bda90fbc8b477de70fd144 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 29 Oct 2013 12:46:09 +0000 Subject: [PATCH] sna: Don't attempt to move the GC back to the GPU before it is moved away Fixes regression from commit e3f15cbf39696edae9f716bdcfbb7032ec7d7e3f [2.99.905] Author: Chris Wilson 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 --- src/sna/sna_accel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index b7ee092c..16d76a29 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -5065,7 +5065,7 @@ sna_self_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr gc, fallback: DBG(("%s: fallback", __FUNCTION__)); if (!sna_pixmap_move_to_cpu(pixmap, MOVE_READ | MOVE_WRITE)) - goto out; + goto free_boxes; if (alu == GXcopy && pixmap->drawable.bitsPerPixel >= 8) { if (sigtrap_get() == 0) { @@ -5105,6 +5105,7 @@ out: } } +free_boxes: if (box != RegionRects(region)) free(box); }