From 1f2143eea6207316e25f4008ea793eea7ef39816 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Mon, 24 Feb 2025 11:47:47 -0600 Subject: [PATCH] nvk: Do not set INVALIDATE_SKED_CACHES pre-MaxwellB The other two uses of this are behind guards but we forgot this one. Fixes: 976f22a5da30 ("nvk: Implement CmdProcess/ExecuteGeneratedCommandsEXT") Part-of: (cherry picked from commit 58218c734973f632edd7927994aa2b6e01bd6b31) --- .pick_status.json | 2 +- src/nouveau/vulkan/nvk_cmd_indirect.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 14884b04c70..8a569c17ae3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1824,7 +1824,7 @@ "description": "nvk: Do not set INVALIDATE_SKED_CACHES pre-MaxwellB", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "976f22a5da30c503b05e2873e4d265fb0d4ecb07", "notes": null diff --git a/src/nouveau/vulkan/nvk_cmd_indirect.c b/src/nouveau/vulkan/nvk_cmd_indirect.c index e87c839546a..50e8f99d5a1 100644 --- a/src/nouveau/vulkan/nvk_cmd_indirect.c +++ b/src/nouveau/vulkan/nvk_cmd_indirect.c @@ -1011,6 +1011,8 @@ nvk_CmdExecuteGeneratedCommandsEXT(VkCommandBuffer commandBuffer, VK_FROM_HANDLE(nvk_cmd_buffer, cmd, commandBuffer); VK_FROM_HANDLE(nvk_indirect_commands_layout, layout, info->indirectCommandsLayout); + struct nvk_device *dev = nvk_cmd_buffer_device(cmd); + const struct nvk_physical_device *pdev = nvk_device_physical(dev); if (!isPreprocessed) { nvk_cmd_flush_process_state(cmd, info); @@ -1022,7 +1024,8 @@ nvk_CmdExecuteGeneratedCommandsEXT(VkCommandBuffer commandBuffer, .constant = CONSTANT_TRUE, .flush_data = FLUSH_DATA_TRUE, }); - P_IMMD(p, NVB1C0, INVALIDATE_SKED_CACHES, 0); + if (pdev->info.cls_eng3d >= MAXWELL_COMPUTE_B) + P_IMMD(p, NVB1C0, INVALIDATE_SKED_CACHES, 0); __push_immd(p, SUBC_NV9097, NV906F_SET_REFERENCE, 0); }