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

sna: Relax unclean rules to check busyness on all foreign pixmaps 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2015-04-01 15:50:46 +01:00
parent 35537ec4bf
commit cdac2b369a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/sna/sna_accel.c
View File

@ -3283,17 +3283,18 @@ inline static void sna_pixmap_unclean(struct sna *sna, struct sna_pixmap *priv)
sna_damage_destroy(&priv->cpu_damage);
list_del(&priv->flush_list);
if ((priv->gpu_bo->needs_flush & priv->flush) == 0 ||
priv->gpu_bo->exec)
if (!priv->flush || priv->gpu_bo->exec)
return;
DBG(("%s(pixmap=%ld): cleaning foreign bo handle=%u\n",
__FUNCTION__, priv->pixmap->drawable.serialNumber, priv->gpu_bo->handle));
busy.handle = priv->gpu_bo->handle;
busy.busy = 0;
ioctl(sna->kgem.fd, DRM_IOCTL_I915_GEM_BUSY, &busy);
DBG(("%s(pixmap=%ld): cleaning foreign bo handle=%u, busy=%x [ring=%d]\n",
__FUNCTION__,
priv->pixmap->drawable.serialNumber,
busy.handle, busy.busy, !!(busy.busy & (0xfffe << 16))));
if (busy.busy) {
unsigned mode = KGEM_RENDER;
if (busy.busy & (0xfffe << 16))