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

sna/dri2: Be wary of interactions with DRI3 and sna_pixmap->flush 

Since both DRI2 and DRI3 manipulate the sna_pixmap->flush flag, we have
to relaxation assertions that it is wholly owned by DRI2.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2015-06-11 13:43:10 +01:00
parent f71148a8b7
commit 19d1e4ee19
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sna/sna_dri2.c
View File

@ -462,7 +462,7 @@ static struct kgem_bo *sna_pixmap_set_dri(struct sna *sna,
return NULL;
}
assert(priv->flush == false);
assert(priv->flush == false || priv->pinned & PIN_DRI3);
assert(priv->cpu_damage == NULL);
assert(priv->gpu_bo);
assert(priv->gpu_bo->proxy == NULL);
@ -699,7 +699,7 @@ sna_dri2_create_buffer(DrawablePtr draw,
pixmap->refcnt++;
priv = sna_pixmap(pixmap);
assert(priv->flush == false);
assert(priv->flush == false || priv->pinned & PIN_DRI3);
assert((priv->pinned & PIN_DRI2) == 0);
/* Don't allow this named buffer to be replaced */
@ -780,7 +780,8 @@ static void _sna_dri2_destroy_buffer(struct sna *sna, DRI2Buffer2Ptr buffer)
priv->gpu_bo->flush = false;
priv->pinned &= ~PIN_DRI2;
priv->flush = false;
if ((priv->pinned & PIN_DRI3) == 0)
priv->flush = false;
sna_accel_watch_flush(sna, -1);
sna_pixmap_set_buffer(pixmap, NULL);