From 1bf88d0bf90b5becbb19726d6d2c191ad339be6b Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Sat, 3 Dec 2022 08:23:05 -0800 Subject: [PATCH] freedreno/drm: Allow submit merging with explicit sync Signed-off-by: Rob Clark Part-of: --- src/freedreno/drm/freedreno_ringbuffer_sp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/freedreno/drm/freedreno_ringbuffer_sp.c b/src/freedreno/drm/freedreno_ringbuffer_sp.c index 2c802825db8..b707a10f8bd 100644 --- a/src/freedreno/drm/freedreno_ringbuffer_sp.c +++ b/src/freedreno/drm/freedreno_ringbuffer_sp.c @@ -297,6 +297,12 @@ fd_submit_sp_flush(struct fd_submit *submit, int in_fence_fd, bool has_shared = fd_submit_sp_flush_prep(submit, in_fence_fd, out_fence); + /* The rule about skipping submit merging with shared buffers is only + * needed for implicit-sync. + */ + if (pipe->no_implicit_sync) + has_shared = false; + assert(fd_fence_before(pipe->last_enqueue_fence, submit->fence)); pipe->last_enqueue_fence = submit->fence;