xf86-video-intel: src/sna/sna_accel.c
Chris Wilson
ickle at kemper.freedesktop.org
Thu Jun 27 02:03:48 PDT 2013
src/sna/sna_accel.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 591981a36c333cdf08a91f28fb9670a62b95d31a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu Jun 27 10:02:28 2013 +0100
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 at chris-wilson.co.uk>
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 1409779..0412863 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -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 &&
More information about the xorg-commit
mailing list