freedreno/drm: Allow submit merging with explicit sync

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20263>

diff --git a/src/freedreno/drm/freedreno_ringbuffer_sp.c b/src/freedreno/drm/freedreno_ringbuffer_sp.c
index 2c80282..b707a10 100644 (file)
--- 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;