From 4db32ac7ef06959f4f02bf7dad42bd3151e6be17 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 21 Jun 2024 10:40:55 +0200 Subject: [PATCH] radv/amdgpu: use the non-IB path for dumping CS with external IBs Only the first CS chunk was dumped, but this allows to dump CS that are post the DGC execute IB when on compute queue. Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 7 ++++++- 1 file changed, 6 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 65d198dd6c8..d0e75564dfc 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c @@ -1392,7 +1392,7 @@ radv_amdgpu_winsys_cs_dump(struct radeon_cmdbuf *_cs, FILE *file, const int *tra struct radv_amdgpu_cs *cs = (struct radv_amdgpu_cs *)_cs; struct radv_amdgpu_winsys *ws = cs->ws; - if (cs->use_ib) { + if (cs->use_ib && !radv_amdgpu_cs_has_external_ib(cs)) { struct radv_amdgpu_cs_ib_info ib_info = radv_amdgpu_cs_ib_to_info(cs, cs->ib_buffers[0]); struct ac_addr_info addr_info; @@ -1429,6 +1429,11 @@ radv_amdgpu_winsys_cs_dump(struct radeon_cmdbuf *_cs, FILE *file, const int *tra char name[64]; void *mapped; + if (!ib->bo) { + fprintf(file, "Chunk %d isn't owned by this CS.\n\n", i); + continue; + } + mapped = radv_buffer_map(&ws->base, ib->bo); if (!mapped) continue;