From 657bc4365b0ab7775527c6d155530cbd0d1b5f0d Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Thu, 11 Jul 2024 18:30:22 -0500 Subject: [PATCH] nvk: Fix indirect cbuf binds pre-Turing nvk_cmd_buffer_push_indirect() takes bytes, not dwords. Fixes: ee29a8d1cdbd ("nvk: Upload cbufs based on the cbuf_map") Part-of: (cherry picked from commit a888e83c3a299e6617aaf367028ca0ffa90bc779) --- .pick_status.json | 2 +- src/nouveau/vulkan/nvk_cmd_draw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 0987b0f180f..7078e6624e9 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -174,7 +174,7 @@ "description": "nvk: Fix indirect cbuf binds pre-Turing", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "ee29a8d1cdbdc553caac8ceeda03f5c737eda0f2", "notes": null diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c index 7d3137c15e1..cb5fd9c7498 100644 --- a/src/nouveau/vulkan/nvk_cmd_draw.c +++ b/src/nouveau/vulkan/nvk_cmd_draw.c @@ -2493,7 +2493,7 @@ nvk_flush_descriptors(struct nvk_cmd_buffer *cmd) P_INLINE_DATA(p, g | (c << 4)); nv_push_update_count(p, 3); - nvk_cmd_buffer_push_indirect(cmd, desc_addr, 3); + nvk_cmd_buffer_push_indirect(cmd, desc_addr, 12); } } }