From 7b76d46e3890a9387430177bed870ea841103839 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 23 Jan 2023 16:43:32 +0100 Subject: [PATCH] radv: fix RADV_DEBUG=hang with multiple cmdbuffer per submission With RADV_DEBUG=hang, there is only one cmdbuffer per submission and this has been broken recently. This fixes a segfault when generating GPU hang reports. Fixes: 76deaa1b1a9 ("radv: Refactor command buffer handling in radv_queue_submit_normal.") Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 4a48bcd..ff86076 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -5854,6 +5854,7 @@ radv_queue_submit_normal(struct radv_queue *queue, struct vk_queue_submit *submi const bool last_submit = j + advance == cmd_buffer_count; bool submit_ace = false; unsigned num_submitted_cs = 0; + unsigned cs_idx = 0; if (queue->device->trace_bo) *queue->device->trace_id_ptr = 0; @@ -5876,6 +5877,7 @@ radv_queue_submit_normal(struct radv_queue *queue, struct vk_queue_submit *submi can_patch &= !(cmd_buffer->usage_flags & VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT); cs_array[num_submitted_cs++] = cmd_buffer->cs; + cs_idx = num_submitted_cs - 1; } /* Add gang wait postambles to make sure the gang leader waits for the whole gang. */ @@ -5899,7 +5901,7 @@ radv_queue_submit_normal(struct radv_queue *queue, struct vk_queue_submit *submi goto fail; if (queue->device->trace_bo) { - radv_check_gpu_hangs(queue, cs_array[j]); + radv_check_gpu_hangs(queue, cs_array[cs_idx]); } if (queue->device->tma_bo) { -- 2.7.4