fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 15:48:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

radv/amdgpu: fix dumping cs with RADV_DEBUG=noibs

Browse source 
The ib_buffer is NULL now.

Fixes: 50e6b16855 ("radv/amdgpu: Use fallback submit for queues that can't use IBs.")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23646>
(cherry picked from commit 8af705a856)
This commit is contained in:
Samuel Pitoiset 2023-06-14 13:29:02 +02:00 • committed by Eric Engestrom
parent 2ac642c5f9
commit 034fc76054
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -895,7 +895,7 @@
"description": "radv/amdgpu: fix dumping cs with RADV_DEBUG=noibs",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "50e6b16855d5f72c3a8e16bc131d6d88b5cddfff"
},

9
src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
View file

@ -1224,8 +1224,15 @@ radv_amdgpu_winsys_cs_dump(struct radeon_cmdbuf *_cs, FILE *file, const int *tra
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);