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

sna: Do not migrate uninitialised pixmaps 

Reported-by: Jiri Slaby <jirislaby@gmail.com>
References: https://bugs.freedesktop.org/show_bug.cgi?id=47597
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-11-21 17:08:53 +00:00
parent 44dad49014
commit ee72375ecd
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sna/sna_render.c
View File

@ -423,6 +423,12 @@ move_to_gpu(PixmapPtr pixmap, const BoxRec *box, bool blt)
return priv->gpu_bo;
}
if (priv->cpu_damage == NULL) {
DBG(("%s: not migrating uninitialised pixmap\n",
__FUNCTION__));
return NULL;
}
if (pixmap->usage_hint) {
DBG(("%s: not migrating pixmap due to usage_hint=%d\n",
__FUNCTION__, pixmap->usage_hint));
@ -520,6 +526,7 @@ static struct kgem_bo *upload(struct sna *sna,
channel->width == pixmap->drawable.width &&
channel->height == pixmap->drawable.height) {
assert(priv->gpu_damage == NULL);
assert(DAMAGE_IS_ALL(priv->cpu_damage));
kgem_proxy_bo_attach(bo, &priv->gpu_bo);
}
}
@ -1154,6 +1161,7 @@ sna_render_picture_extract(struct sna *sna,
struct sna_pixmap *priv = sna_pixmap(pixmap);
if (priv) {
assert(priv->gpu_damage == NULL);
assert(DAMAGE_IS_ALL(priv->cpu_damage));
kgem_proxy_bo_attach(bo, &priv->gpu_bo);
}
}