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

sna: Clear mapped hints upon cloning a pair of pixmaps 

Once cloned, we do not want to use inplace operations and instead force
a copy. However, if we do not relinquish the hints when copying across
the bo, then those hints become stale and lead to corruption.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-05-17 10:30:51 +01:00
parent f57a65c352
commit 3efe143e36
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/sna/sna_accel.c
View File

@ -1536,14 +1536,15 @@ static inline bool use_cpu_bo_for_upload(struct sna *sna,
static bool
sna_pixmap_undo_cow(struct sna *sna, struct sna_pixmap *priv, unsigned flags)
{
assert(priv->gpu_bo == priv->cow->bo);
DBG(("%s: pixmap=%ld, handle=%ld, flags=%x\n",
__FUNCTION__,
priv->pixmap->drawable.serialNumber,
priv->gpu_bo->handle,
flags));
assert(priv->gpu_bo == priv->cow->bo);
assert(!priv->mapped);
if (!--priv->cow->refcnt) {
free(priv->cow);
} else {
@ -1612,6 +1613,7 @@ sna_pixmap_make_cow(struct sna *sna,
return false;
}
assert(!src_priv->flush);
assert(!dst_priv->flush);
cow = src_priv->cow;
@ -1624,7 +1626,13 @@ sna_pixmap_make_cow(struct sna *sna,
cow->refcnt = 1;
src_priv->cow = cow;
if (src_priv->mapped) {
src_priv->pixmap->devPrivate.ptr = NULL;
src_priv->mapped = false;
}
}
assert(!src_priv->mapped);
if (cow == dst_priv->cow)
return true;
@ -1638,6 +1646,11 @@ sna_pixmap_make_cow(struct sna *sna,
dst_priv->cow = cow;
cow->refcnt++;
if (dst_priv->mapped) {
dst_priv->pixmap->devPrivate.ptr = NULL;
dst_priv->mapped = false;
}
return true;
}