From 05f249ca93eb58a558fb6df547499bc28114a8e7 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 15 Apr 2025 07:02:42 +1000 Subject: [PATCH] nvk: Fix compute class comparison in dispatch indirect This works by coincidence rather than design. Reviewed-by: Mel Henning Cc: mesa-stable Part-of: (cherry picked from commit bd7777aee60941ebf3aadfa9314236977eb262ba) --- .pick_status.json | 2 +- src/nouveau/vulkan/nvk_cmd_dispatch.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d16788a0a53..1de657b4e04 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2084,7 +2084,7 @@ "description": "nvk: Fix compute class comparison in dispatch indirect", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/nouveau/vulkan/nvk_cmd_dispatch.c b/src/nouveau/vulkan/nvk_cmd_dispatch.c index b777638dce3..91e33653dc0 100644 --- a/src/nouveau/vulkan/nvk_cmd_dispatch.c +++ b/src/nouveau/vulkan/nvk_cmd_dispatch.c @@ -512,7 +512,7 @@ nvk_CmdDispatchIndirect(VkCommandBuffer commandBuffer, } struct nv_push *p; - if (nvk_cmd_buffer_compute_cls(cmd) >= TURING_A) { + if (nvk_cmd_buffer_compute_cls(cmd) >= TURING_COMPUTE_A) { p = nvk_cmd_buffer_push(cmd, 14); P_IMMD(p, NVC597, SET_MME_DATA_FIFO_CONFIG, FIFO_SIZE_SIZE_4KB); P_1INC(p, NV9097, CALL_MME_MACRO(NVK_MME_DISPATCH_INDIRECT));