From 137c81ffb5811794006cb783c47a72d6a16a174f Mon Sep 17 00:00:00 2001
From: Mel Henning <mhenning@darkrefraction.com>
Date: Mon, 1 Dec 2025 17:00:06 -0500
Subject: [PATCH] WIP

---
 src/nouveau/vulkan/nvk_cmd_buffer.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/nouveau/vulkan/nvk_cmd_buffer.c b/src/nouveau/vulkan/nvk_cmd_buffer.c
index 44ca13b13f5..b5330b9f0a7 100644
--- a/src/nouveau/vulkan/nvk_cmd_buffer.c
+++ b/src/nouveau/vulkan/nvk_cmd_buffer.c
@@ -581,7 +581,7 @@ nvk_cmd_flush_wait_dep(struct nvk_cmd_buffer *cmd,
       struct nv_push *p = nvk_cmd_buffer_push(cmd, 2);
 
       /* This is also implicitly a WFI */
-      if (nvk_cmd_buffer_last_subchannel(cmd) == SUBC_NV902D) {
+      /*if (nvk_cmd_buffer_last_subchannel(cmd) == SUBC_NV902D) {
       } else if (nvk_cmd_buffer_last_subchannel(cmd) == SUBC_NVA097) {
          P_IMMD(p, NVA097, INVALIDATE_SHADER_CACHES, {
             .data = DATA_TRUE,
@@ -592,7 +592,8 @@ nvk_cmd_flush_wait_dep(struct nvk_cmd_buffer *cmd,
             .data = DATA_TRUE,
             .flush_data = FLUSH_DATA_TRUE,
          });
-      }
+      }*/
+      P_IMMD(p, NV902D, WAIT_FOR_IDLE, 0);
    } else if ((barriers & NVK_BARRIER_WFI) && wait) {
       /* If this comes from a vkCmdSetEvent, we don't need to wait
        *
@@ -692,7 +693,7 @@ nvk_cmd_invalidate_deps(struct nvk_cmd_buffer *cmd,
 
    if (barriers & NVK_BARRIER_INVALIDATE_TEX_DATA) {
       if (pdev->info.cls_eng3d >= MAXWELL_A) {
-         if (nvk_cmd_buffer_last_subchannel(cmd) == SUBC_NV902D) {
+         /*if (nvk_cmd_buffer_last_subchannel(cmd) == SUBC_NV902D) {
          } else if (nvk_cmd_buffer_last_subchannel(cmd) == SUBC_NVA097) {
             P_IMMD(p, NVA097, INVALIDATE_TEXTURE_DATA_CACHE_NO_WFI, {
                .lines = LINES_ALL,
@@ -701,7 +702,8 @@ nvk_cmd_invalidate_deps(struct nvk_cmd_buffer *cmd,
             P_IMMD(p, NVA0C0, INVALIDATE_TEXTURE_DATA_CACHE_NO_WFI, {
                .lines = LINES_ALL,
             });
-         }
+         }*/
+         P_IMMD(p, NV902D, WAIT_FOR_IDLE, 0);
       } else {
          /* On Kepler, the _NO_WFI form doesn't appear to actually work
           * properly.  It exists in the headers but it doesn't fully
@@ -726,7 +728,7 @@ nvk_cmd_invalidate_deps(struct nvk_cmd_buffer *cmd,
 
    if (barriers & (NVK_BARRIER_INVALIDATE_SHADER_DATA |
                    NVK_BARRIER_INVALIDATE_CONSTANT)) {
-      if (nvk_cmd_buffer_last_subchannel(cmd) == SUBC_NV902D) {
+      /*if (nvk_cmd_buffer_last_subchannel(cmd) == SUBC_NV902D) {
       } else if (nvk_cmd_buffer_last_subchannel(cmd) == SUBC_NVA097) {
          P_IMMD(p, NVA097, INVALIDATE_SHADER_CACHES_NO_WFI, {
             .global_data = (barriers & NVK_BARRIER_INVALIDATE_SHADER_DATA) != 0,
@@ -737,7 +739,8 @@ nvk_cmd_invalidate_deps(struct nvk_cmd_buffer *cmd,
             .global_data = (barriers & NVK_BARRIER_INVALIDATE_SHADER_DATA) != 0,
             .constant = (barriers & NVK_BARRIER_INVALIDATE_CONSTANT) != 0,
          });
-      }
+      }*/
+      P_IMMD(p, NV902D, WAIT_FOR_IDLE, 0);
    }
 
    if (barriers & (NVK_BARRIER_INVALIDATE_MME_DATA)) {