From a941ce746a7aca7284085489c63f1e74c657ee4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Fri, 3 May 2024 09:41:18 -0700 Subject: [PATCH] anv: Free intel_perf_config when destroying physical device MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Lionel Landwerlin Signed-off-by: José Roberto de Souza Part-of: --- src/intel/vulkan/anv_device.c | 4 ++-- src/intel/vulkan/anv_perf.c | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 3c33f98b6cf..d11eeceaee7 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -2579,7 +2579,7 @@ anv_physical_device_try_create(struct vk_instance *vk_instance, return VK_SUCCESS; fail_perf: - ralloc_free(device->perf); + intel_perf_free(device->perf); free(device->engine_info); anv_physical_device_free_disk_cache(device); fail_compiler: @@ -2606,7 +2606,7 @@ anv_physical_device_destroy(struct vk_physical_device *vk_device) free(device->engine_info); anv_physical_device_free_disk_cache(device); ralloc_free(device->compiler); - ralloc_free(device->perf); + intel_perf_free(device->perf); close(device->local_fd); if (device->master_fd >= 0) close(device->master_fd); diff --git a/src/intel/vulkan/anv_perf.c b/src/intel/vulkan/anv_perf.c index 247b6174ca2..2880a82bcce 100644 --- a/src/intel/vulkan/anv_perf.c +++ b/src/intel/vulkan/anv_perf.c @@ -36,8 +36,6 @@ void anv_physical_device_init_perf(struct anv_physical_device *device, int fd) { - device->perf = NULL; - struct intel_perf_config *perf = intel_perf_new(NULL); intel_perf_init_metrics(perf, &device->info, fd, @@ -85,8 +83,8 @@ anv_physical_device_init_perf(struct anv_physical_device *device, int fd) return; - err: - ralloc_free(perf); +err: + intel_perf_free(perf); } void