fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-22 06:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nvk: Add a wfi for blackwell in CmdDispatchIndirect

Browse source 
This fixes CTS flakes in several tests, for example:
dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_copy_buffer_read_ssbo_compute_indirect.buffer_262144_opaque_fd

Fixes: 1c77a6f049 ("nvk: Don't emit MME FIFO config on Blackwell+")
Reviewed-by: Mary Guillemard <mary@mary.zone>
(cherry picked from commit 1e114e2dce)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41540>
This commit is contained in:
Mel Henning 2026-04-15 18:54:43 -04:00 • committed by Eric Engestrom
parent ca89a69436
commit 1d37a56a75
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -284,7 +284,7 @@
"description": "nvk: Add a wfi for blackwell in CmdDispatchIndirect",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "1c77a6f049da4901682cac62f23d53d60eb9d22d",
"notes": null

12
src/nouveau/vulkan/nvk_cmd_dispatch.c
View file

@ -564,8 +564,18 @@ nvk_CmdDispatchIndirect(VkCommandBuffer commandBuffer,
struct nv_push *p;
if (nvk_cmd_buffer_compute_cls(cmd) >= TURING_COMPUTE_A) {
p = nvk_cmd_buffer_push(cmd, 14);
if (nvk_cmd_buffer_compute_cls(cmd) < BLACKWELL_COMPUTE_A)
if (nvk_cmd_buffer_compute_cls(cmd) < BLACKWELL_COMPUTE_A) {
P_IMMD(p, NVC597, SET_MME_DATA_FIFO_CONFIG, FIFO_SIZE_SIZE_4KB);
} else {
/* The line in the other side of the if causes an implicit wfi
* due to the subc switch which we apparently rely on for
* correctness (!?). Anyway, to prevent issues on blackwell
* we need to wfi here too.
* TODO: delete this
*/
P_IMMD(p, NVC86F, WFI, 0);
}
if (nvk_cmd_buffer_compute_cls(cmd) >= AMPERE_COMPUTE_B)
P_1INC(p, NVC7C0, CALL_MME_MACRO(NVK_MME_DISPATCH_INDIRECT));
else