From b5c8c1dcb20bb88cdb1898fbc890a96d4e35a593 Mon Sep 17 00:00:00 2001
From: emre <emre.yavuz.842@gmail.com>
Date: Thu, 26 Mar 2026 01:23:36 +0300
Subject: [PATCH] nvk: fix barrier cache invalidation

Fixes: e1c1cdbd5f38 ("nvk: Implement vkCmdPipelineBarrier2 for real")
Reviewed-by: Mary Guillemard <mary@mary.zone>
Reviewed-by: Mel Henning <mhenning@darkrefraction.com>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
(cherry picked from commit fe558d83281bc509fe097f8836627825786d041b)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40752>
---
 .pick_status.json                   | 2 +-
 src/nouveau/vulkan/nvk_cmd_buffer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index fa6580c59c7..5f3c3c8eae7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1834,7 +1834,7 @@
         "description": "nvk: fix barrier cache invalidation",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "e1c1cdbd5f382bca34c6d8e5728a90274b893dc0",
         "notes": null
diff --git a/src/nouveau/vulkan/nvk_cmd_buffer.c b/src/nouveau/vulkan/nvk_cmd_buffer.c
index 84e0b15894d..e2fd0bb416d 100644
--- a/src/nouveau/vulkan/nvk_cmd_buffer.c
+++ b/src/nouveau/vulkan/nvk_cmd_buffer.c
@@ -714,7 +714,7 @@ nvk_cmd_invalidate_deps(struct nvk_cmd_buffer *cmd,
        dev->vk.enabled_features.pipelineFragmentShadingRate)
       P_IMMD(p, NVC597, INVALIDATE_RASTER_CACHE_NO_WFI, 0);
 
-   if (barriers & (NVK_BARRIER_INVALIDATE_SHADER_DATA &
+   if (barriers & (NVK_BARRIER_INVALIDATE_SHADER_DATA |
                    NVK_BARRIER_INVALIDATE_CONSTANT)) {
       if (nvk_cmd_buffer_last_subchannel(cmd) == SUBC_NVA097) {
          P_IMMD(p, NVA097, INVALIDATE_SHADER_CACHES_NO_WFI, {