From 275691e94c05e943d4deaa685dcbacaec1b2158b Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Mon, 30 Jan 2023 20:12:00 -0600
Subject: [PATCH] nvk: WFI in pipeline barriers

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
---
 src/nouveau/vulkan/nvk_cmd_buffer.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/nouveau/vulkan/nvk_cmd_buffer.c b/src/nouveau/vulkan/nvk_cmd_buffer.c
index 8b625c65735..33c91be8b74 100644
--- a/src/nouveau/vulkan/nvk_cmd_buffer.c
+++ b/src/nouveau/vulkan/nvk_cmd_buffer.c
@@ -232,10 +232,18 @@ nvk_CmdExecuteCommands(VkCommandBuffer commandBuffer,
    }
 }
 
+#include "nvk_cl9097.h"
+
 VKAPI_ATTR void VKAPI_CALL
 nvk_CmdPipelineBarrier2(VkCommandBuffer commandBuffer,
                         const VkDependencyInfo *pDependencyInfo)
-{ }
+{
+   VK_FROM_HANDLE(nvk_cmd_buffer, cmd, commandBuffer);
+
+   /* TODO: We don't need to WFI all the time, do we? */
+   struct nv_push *p = nvk_cmd_buffer_push(cmd, 2);
+   P_IMMD(p, NV9097, WAIT_FOR_IDLE, 0);
+}
 
 VKAPI_ATTR void VKAPI_CALL
 nvk_CmdBindPipeline(VkCommandBuffer commandBuffer,