From b35fd1bff6d8813411d9ca7f8c221c47ed5cf8fe Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 20 Oct 2021 08:43:01 +0200 Subject: [PATCH] radv: move freeing the trigger SQTT file at a better place Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/radv_device.c | 2 -- src/amd/vulkan/radv_sqtt.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 5ad39b3..21983a5 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -3234,7 +3234,6 @@ fail_meta: radv_device_finish_meta(device); fail: radv_thread_trace_finish(device); - free(device->thread_trace.trigger_file); radv_trap_handler_finish(device); radv_finish_trace(device); @@ -3303,7 +3302,6 @@ radv_DestroyDevice(VkDevice _device, const VkAllocationCallbacks *pAllocator) u_cnd_monotonic_destroy(&device->timeline_cond); - free(device->thread_trace.trigger_file); radv_thread_trace_finish(device); vk_device_finish(&device->vk); diff --git a/src/amd/vulkan/radv_sqtt.c b/src/amd/vulkan/radv_sqtt.c index 71c4899..842e3df 100644 --- a/src/amd/vulkan/radv_sqtt.c +++ b/src/amd/vulkan/radv_sqtt.c @@ -466,6 +466,8 @@ radv_thread_trace_finish(struct radv_device *device) struct ac_thread_trace_data *thread_trace_data = &device->thread_trace; struct radeon_winsys *ws = device->ws; + free(device->thread_trace.trigger_file); + radv_thread_trace_finish_bo(device); for (unsigned i = 0; i < 2; i++) { -- 2.7.4