diff options
| author | Rob Clark <robdclark@chromium.org> | 2020-08-04 14:24:44 -0700 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-08-05 19:05:29 +0000 |
| commit | 141b295311aed28d64a850531490d2044f5b6a78 (patch) | |
| tree | 250f428555f361359252b91862cf06e7a5b5b23f | |
| parent | 07a49bf59766b7c40d35608a98bd4a5796dcc2fe (diff) | |
freedreno: allow fence_fd fences to be recycled
This allows us to avoid a no-op flush if there has been no rendering,
but we hit pctx->flush(PIPE_FLUSH_FENCE_FD).
Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6177>
| -rw-r--r-- | src/gallium/drivers/freedreno/freedreno_context.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/freedreno/freedreno_fence.c | 5 | ||||
| -rw-r--r-- | src/gallium/drivers/freedreno/freedreno_fence.h | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/gallium/drivers/freedreno/freedreno_context.c b/src/gallium/drivers/freedreno/freedreno_context.c index a69a194379b..4ebb279bc3b 100644 --- a/src/gallium/drivers/freedreno/freedreno_context.c +++ b/src/gallium/drivers/freedreno/freedreno_context.c @@ -60,7 +60,8 @@ fd_context_flush(struct pipe_context *pctx, struct pipe_fence_handle **fencep, * not an "fd" fence, which results in eglDupNativeFenceFDANDROID() * errors. */ - if (flags & PIPE_FLUSH_FENCE_FD) + if ((flags & PIPE_FLUSH_FENCE_FD) && ctx->last_fence && + !fd_fence_is_fd(ctx->last_fence)) fd_fence_ref(&ctx->last_fence, NULL); /* if no rendering since last flush, ie. app just decided it needed diff --git a/src/gallium/drivers/freedreno/freedreno_fence.c b/src/gallium/drivers/freedreno/freedreno_fence.c index 59ea1896f45..3477d9835c5 100644 --- a/src/gallium/drivers/freedreno/freedreno_fence.c +++ b/src/gallium/drivers/freedreno/freedreno_fence.c @@ -150,6 +150,11 @@ int fd_fence_get_fd(struct pipe_screen *pscreen, return os_dupfd_cloexec(fence->fence_fd); } +bool fd_fence_is_fd(struct pipe_fence_handle *fence) +{ + return fence->fence_fd != -1; +} + struct pipe_fence_handle * fd_fence_create(struct fd_batch *batch) { return fence_create(batch->ctx, batch, 0, -1); diff --git a/src/gallium/drivers/freedreno/freedreno_fence.h b/src/gallium/drivers/freedreno/freedreno_fence.h index f0bc21bc890..efb9aaee166 100644 --- a/src/gallium/drivers/freedreno/freedreno_fence.h +++ b/src/gallium/drivers/freedreno/freedreno_fence.h @@ -44,6 +44,7 @@ void fd_fence_server_sync(struct pipe_context *pctx, struct pipe_fence_handle *fence); int fd_fence_get_fd(struct pipe_screen *pscreen, struct pipe_fence_handle *pfence); +bool fd_fence_is_fd(struct pipe_fence_handle *fence); struct fd_batch; struct pipe_fence_handle * fd_fence_create(struct fd_batch *batch); |