fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-02 08:50:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv/sqtt: delay VMID reservation at capture time

Browse source 
If two devices/instances are created, the VMID reservation will just
fail. It seems fine as long as it's reserved before SPM is used.

Fixes: a7a4abc8d8 ("radv: Move VMID reservation to vkCreateDevice")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39462>
This commit is contained in:
Samuel Pitoiset 2026-01-14 14:53:57 +01:00 • committed by Dylan Baker
parent 25b6338eff
commit ab64109c01
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/amd/vulkan/radv_sqtt.c
View file

@ -438,11 +438,6 @@ radv_sqtt_init(struct radv_device *device)
device->sqtt.buffer_size = (uint32_t)debug_get_num_option("RADV_THREAD_TRACE_BUFFER_SIZE", 32 * 1024 * 1024);
device->sqtt.instruction_timing_enabled = radv_is_instruction_timing_enabled();
if (device->ws->reserve_vmid && device->ws->reserve_vmid(device->ws) < 0) {
fprintf(stderr, "radv: Failed to reserve VMID for SQTT tracing.\n");
return false;
}
if (!radv_sqtt_init_bo(device))
return false;
@ -478,9 +473,6 @@ radv_sqtt_finish(struct radv_device *device)
radv_unregister_queues(device, sqtt);
ac_sqtt_finish(sqtt);
if (device->ws && device->ws->unreserve_vmid)
device->ws->unreserve_vmid(device->ws);
}
static bool
@ -667,6 +659,12 @@ radv_sqtt_start_capturing(struct radv_queue *queue)
return;
}
/* Reserve a VMID to allow the KMD to update SPM_VMID accordingly. */
if (device->ws->reserve_vmid(device->ws) < 0) {
fprintf(stderr, "radv: Failed to reserve VMID for SQTT tracing.\n");
return;
}
/* Sample CPU/GPU clocks before starting the trace. */
if (!radv_sqtt_sample_clocks(device)) {
fprintf(stderr, "radv: Failed to sample clocks\n");
@ -692,6 +690,8 @@ radv_sqtt_stop_capturing(struct radv_queue *queue)
/* TODO: Do something better than this whole sync. */
device->vk.dispatch_table.QueueWaitIdle(radv_queue_to_handle(queue));
device->ws->unreserve_vmid(device->ws);
if (radv_get_sqtt_trace(queue, &sqtt_trace) && (!device->spm.bo || radv_get_spm_trace(queue, &spm_trace))) {
ac_dump_rgp_capture(&pdev->info, &sqtt_trace, device->spm.bo ? &spm_trace : NULL);
} else {