From 99f92dd6d3132cbb9c5fe53d3c899a9e9719328b Mon Sep 17 00:00:00 2001
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Thu, 6 Jun 2024 10:11:19 +0300
Subject: [PATCH] anv: ensure completion of surface state copies before
 secondaries

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: mesa-stable
Reviewed-by: Rohan Garg <rohan.garg@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29671>
---
 src/intel/vulkan/genX_cmd_buffer.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index af288f4a791..0270dd351c7 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -3290,6 +3290,11 @@ genX(CmdExecuteCommands)(
       }
       genX(emit_so_memcpy_fini)(&memcpy_state);
 
+      anv_add_pending_pipe_bits(container,
+                                ANV_PIPE_CS_STALL_BIT | ANV_PIPE_STALL_AT_SCOREBOARD_BIT,
+                                "Wait for primary->secondary RP surface state copies");
+      genX(cmd_buffer_apply_pipe_flushes)(container);
+
       if (container->vk.pool->flags & VK_COMMAND_POOL_CREATE_PROTECTED_BIT)
          genX(cmd_buffer_set_protected_memory)(container, true);
    }