diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-10-29 12:46:09 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-10-29 12:46:58 +0000 |
| commit | 56e3761dec7ea3fc35bda90fbc8b477de70fd144 (patch) | |
| tree | e88ea9f4e06320854092fb8f417924d0c72f36c0 /src/sna/sna_accel.c | |
| parent | 4f41bf3de059c4e0a03fb161fb2e78d94be69e3f (diff) | |
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 <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>
Diffstat (limited to 'src/sna/sna_accel.c')
| -rw-r--r-- | src/sna/sna_accel.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); } |