From bbaaf2fec7ffc21066ece39285f594c2554c8085 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 6 Nov 2025 16:20:58 +0100 Subject: [PATCH] radv: move back ac_sqtt_{init,finish}() to the right places Now that radv/tests no longer create compute pipelines. Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_device.c | 4 ---- src/amd/vulkan/radv_sqtt.c | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 40874220879..4900b229d60 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -1138,8 +1138,6 @@ radv_destroy_device(struct radv_device *device, const VkAllocationCallbacks *pAl if (device->capture_replay_arena_vas) _mesa_hash_table_u64_destroy(device->capture_replay_arena_vas); - ac_sqtt_finish(&device->sqtt); - vk_device_finish(&device->vk); vk_free(&device->vk.alloc, device); } @@ -1233,8 +1231,6 @@ radv_CreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCr /* PKT3_LOAD_SH_REG_INDEX is supported on GFX8+, but it hangs with compute queues until GFX10.3. */ device->load_grid_size_from_user_sgpr = pdev->info.gfx_level >= GFX10_3; - ac_sqtt_init(&device->sqtt); - /* If this is a NULL device, we are done here. */ if (pdev->info.family_overridden) { *pDevice = radv_device_to_handle(device); diff --git a/src/amd/vulkan/radv_sqtt.c b/src/amd/vulkan/radv_sqtt.c index 14c4f9b968f..de63c0b38a5 100644 --- a/src/amd/vulkan/radv_sqtt.c +++ b/src/amd/vulkan/radv_sqtt.c @@ -400,6 +400,8 @@ radv_sqtt_init(struct radv_device *device) if (!radv_device_acquire_performance_counters(device)) return false; + ac_sqtt_init(sqtt); + radv_register_queues(device, sqtt); return true; @@ -422,6 +424,8 @@ radv_sqtt_finish(struct radv_device *device) } radv_unregister_queues(device, sqtt); + + ac_sqtt_finish(sqtt); } static bool