diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-07-22 08:38:42 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-12-09 08:08:01 +0000 |
| commit | fc984e8953d61901b255422c8f56eb79a2dd2a28 (patch) | |
| tree | 9987beab10abb7872baf8f0a83352f2568bd6c80 | |
| parent | d247cb7d0cdb73736f31612157e47f166af68ba0 (diff) | |
sna/dri3: Mesa relies upon implicit fences for X/Compositor synchronisation
The decision has been made that DRI3/intel shall continue with DRI2-style
implicit fencing for synchronisation between X and clients using pixmaps
as texture sources. (The other way around uses explicit fencing!)
References: https://bugs.freedesktop.org/show_bug.cgi?id=81551
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_accel.c | 3 | ||||
| -rw-r--r-- | src/sna/sna_dri3.c | 36 |
2 files changed, 21 insertions, 18 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index 26b10e92..c7021879 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -1416,6 +1416,9 @@ static void __sna_free_pixmap(struct sna *sna, __sna_pixmap_free_cpu(sna, priv); + if (priv->flush) + sna_accel_watch_flush(sna, -1); + if (priv->header) { assert(pixmap->drawable.pScreen == sna->scrn->pScreen); assert(!priv->shm); diff --git a/src/sna/sna_dri3.c b/src/sna/sna_dri3.c index 1f09aec8..f586e242 100644 --- a/src/sna/sna_dri3.c +++ b/src/sna/sna_dri3.c @@ -49,6 +49,19 @@ static inline struct sna_sync_fence *sna_sync_fence(SyncFence *fence) return dixLookupPrivate(&fence->devPrivates, &sna_sync_fence_private_key); } +static inline void mark_dri3_pixmap(struct sna *sna, struct sna_pixmap *priv, struct kgem_bo *bo) +{ + bo->flush = true; + if (bo->exec) + sna->kgem.flush = 1; + if (bo == priv->gpu_bo) + priv->flush |= 3; + else + priv->shm = true; + + sna_accel_watch_flush(sna, 1); +} + static void sna_sync_flush(struct sna *sna, struct sna_pixmap *priv) { struct kgem_bo *bo = NULL; @@ -83,27 +96,10 @@ sna_sync_fence_set_triggered(SyncFence *fence) { struct sna *sna = to_sna_from_screen(fence->pScreen); struct sna_sync_fence *sna_fence = sna_sync_fence(fence); - DrawablePtr draw = NULL; DBG(("%s()\n", __FUNCTION__)); + sna_accel_flush(sna); -#if 0 - draw = miSyncShmFenceGetDrawable(fence); -#endif - if (draw) { - DBG(("%s: associated pixmap=%ld\n", __FUNCTION__, get_drawable_pixmap(draw)->drawable.serialNumber)); - sna_sync_flush(sna, sna_pixmap(get_drawable_pixmap(draw))); - } else { /* SyncFence are currently per-screen, sigh */ - struct sna_pixmap *priv; - - DBG(("%s: flushing all DRI3 pixmaps\n", __FUNCTION__)); - list_for_each_entry(priv, &sna->dri3.pixmaps, cow_list) - sna_sync_flush(sna, priv); - - sna_accel_flush(sna); - } - - DBG(("%s: complete, chaining up\n", __FUNCTION__)); fence->funcs.SetTriggered = sna_fence->set_triggered; sna_fence->set_triggered(fence); sna_fence->set_triggered = fence->funcs.SetTriggered; @@ -278,6 +274,8 @@ static PixmapPtr sna_dri3_pixmap_from_fd(ScreenPtr screen, } list_add(&priv->cow_list, &sna->dri3.pixmaps); + mark_dri3_pixmap(sna, priv, bo); + return pixmap; free_pixmap: @@ -337,6 +335,8 @@ static int sna_dri3_fd_from_pixmap(ScreenPtr screen, priv->pinned |= PIN_DRI3; list_move(&priv->cow_list, &sna->dri3.pixmaps); + mark_dri3_pixmap(sna, priv, bo); + *stride = (priv->pinned & PIN_DRI3) ? priv->gpu_bo->pitch : priv->cpu_bo->pitch; *size = kgem_bo_size((priv->pinned & PIN_DRI3) ? priv->gpu_bo : priv->cpu_bo); DBG(("%s: exporting %s pixmap=%ld, handle=%d, stride=%d, size=%d\n", |