Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: Refactor freeing gpu_bo in manual tiled upload 

Use the common function so that we correctly check for pinned GPU bo,
and adjust the hints afterwards.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-06-27 10:02:28 +01:00
parent 8f6dcc15c8
commit 591981a36c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sna/sna_accel.c
View File

@ -2017,7 +2017,7 @@ skip_inplace_map:
pixmap->drawable.height);
sna_pixmap_free_gpu(sna, priv);
assert(priv->gpu_damage == NULL);
priv->clear = false;
assert(priv->clear == false);
}
if (priv->gpu_damage) {
@ -3962,9 +3962,9 @@ try_upload_tiled_x(PixmapPtr pixmap, RegionRec *region,
if (priv->gpu_bo && (replaces || priv->gpu_bo->proxy)) {
DBG(("%s: discarding cached upload proxy\n", __FUNCTION__));
sna_damage_destroy(&priv->gpu_damage);
kgem_bo_destroy(&sna->kgem, priv->gpu_bo);
priv->gpu_bo = NULL;
if (priv->cow)
sna_pixmap_undo_cow(sna, priv, 0);
sna_pixmap_free_gpu(sna, priv);
}
if (priv->gpu_bo == NULL &&