Mesa (staging/22.1): tu: Add missing WFI to the 3d GMEM store path

[GitLab Mirror]

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

Author: Connor Abbott <cwabbott0 at gmail.com>
Date:   Wed Jun 15 16:59:39 2022 +0200

tu: Add missing WFI to the 3d GMEM store path

Similar to the 2d path.

Fixes: b157a5d ("tu: Implement non-aligned multisample GMEM STORE_OP_STORE")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17058>
(cherry picked from commit a9d7b47613c405ebe3e147fb4a157168cbe7fdbd)

---

 .pick_status.json                    | 2 +-
 src/freedreno/vulkan/tu_clear_blit.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index b5827f141e0..e1b210ac19d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -220,7 +220,7 @@
         "description": "tu: Add missing WFI to the 3d GMEM store path",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "b157a5d0d68ee8a1b4cb862a56b97bd881841413"
     },
diff --git a/src/freedreno/vulkan/tu_clear_blit.c b/src/freedreno/vulkan/tu_clear_blit.c
index ba75d8a0a8c..0d8e487771f 100644
--- a/src/freedreno/vulkan/tu_clear_blit.c
+++ b/src/freedreno/vulkan/tu_clear_blit.c
@@ -2913,6 +2913,9 @@ store_3d_blit(struct tu_cmd_buffer *cmd,
    /* sync GMEM writes with CACHE. */
    tu6_emit_event_write(cmd, cs, CACHE_INVALIDATE);
 
+   /* Wait for CACHE_INVALIDATE to land */
+   tu_cs_emit_wfi(cs);
+
    r3d_run(cmd, cs);
 
    /* Draws write to the CCU, unlike CP_EVENT_WRITE::BLIT which writes to