Revert "sna: Avoid promoting SHM CPU bo to GPU to maintain coherence with SHM clients"

This reverts commit f743cd5734.
This commit is contained in:
Chris Wilson 2013-02-13 16:32:18 +00:00
parent 9861423a76
commit 4bf51ec7bc
1 changed files with 5 additions and 8 deletions

View File

@ -324,14 +324,6 @@ use_cpu_bo(struct sna *sna, PixmapPtr pixmap, const BoxRec *box, bool blt)
return NULL;
}
if (priv->shm) {
DBG(("%s: shm CPU bo, avoiding promotion to GPU\n",
__FUNCTION__));
assert(!priv->flush);
sna_add_flush_pixmap(sna, priv, priv->cpu_bo);
return priv->cpu_bo;
}
if (priv->cpu_bo->snoop && priv->source_count > SOURCE_BIAS) {
DBG(("%s: promoting snooped CPU bo due to reuse\n",
__FUNCTION__));
@ -400,6 +392,11 @@ use_cpu_bo(struct sna *sna, PixmapPtr pixmap, const BoxRec *box, bool blt)
}
}
if (priv->shm) {
assert(!priv->flush);
sna_add_flush_pixmap(sna, priv, priv->cpu_bo);
}
DBG(("%s for box=(%d, %d), (%d, %d)\n",
__FUNCTION__, box->x1, box->y1, box->x2, box->y2));
++priv->source_count;