Mesa (staging/22.1): anv: reset all dynamic state after secondary execution

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: 96202a0fab5991cee3b5a166e94a8cedc6b45022
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=96202a0fab5991cee3b5a166e94a8cedc6b45022

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Thu Apr 28 13:15:53 2022 +0300

anv: reset all dynamic state after secondary execution

We don't know in what state the secondary buffer will leave the HW
when it ends. It's easier to consider everything needs to be reemitted
for now.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16220>
(cherry picked from commit 5048f15737806d2b6795e736e547e4e4de7a37d1)

---

 .pick_status.json                  | 2 +-
 src/intel/vulkan/genX_cmd_buffer.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 888c387cdcc..597018e6a17 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1012,7 +1012,7 @@
         "description": "anv: reset all dynamic state after secondary execution",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index 0faa2163eed..97bc5de06e8 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -1982,6 +1982,7 @@ genX(CmdExecuteCommands)(
    primary->state.current_pipeline = UINT32_MAX;
    primary->state.current_l3_config = NULL;
    primary->state.current_hash_scale = 0;
+   primary->state.gfx.dirty |= ANV_CMD_DIRTY_DYNAMIC_ALL;
 
    /* Each of the secondary command buffers will use its own state base
     * address.  We need to re-emit state base address for the primary after