From 8af705a856793313c6dfcc5d46d7b2e37828c442 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 14 Jun 2023 13:29:02 +0200 Subject: [PATCH] radv/amdgpu: fix dumping cs with RADV_DEBUG=noibs The ib_buffer is NULL now. Fixes: 50e6b16855d ("radv/amdgpu: Use fallback submit for queues that can't use IBs.") Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c index c0cb157c5a9..3046aa84308 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c @@ -1261,8 +1261,15 @@ static void radv_amdgpu_winsys_cs_dump(struct radeon_cmdbuf *_cs, FILE *file, const int *trace_ids, int trace_id_count) { struct radv_amdgpu_cs *cs = (struct radv_amdgpu_cs *)_cs; - void *ib = radv_amdgpu_winsys_get_cpu_addr(cs, cs->ib.ib_mc_address); int num_dw = cs->base.cdw; + void *ib; + + if (cs->use_ib) { + ib = radv_amdgpu_winsys_get_cpu_addr(cs, cs->ib.ib_mc_address); + } else { + ib = cs->base.buf; + } + assert(ib); ac_parse_ib(file, ib, num_dw, trace_ids, trace_id_count, "main IB", cs->ws->info.gfx_level, cs->ws->info.family, radv_amdgpu_winsys_get_cpu_addr, cs);