sna: Don't attempt to move the GC back to the GPU before it is moved away
Fixes regression from
commit e3f15cbf39 [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>
This commit is contained in:
parent
4f41bf3de0
commit
56e3761dec
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue