From aff368fe83bd4bcb4620a1a19e9b71eb67a05af7 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Mon, 31 Oct 2022 18:38:25 +0000
Subject: [PATCH] v3dv: avoid freeing already-freed memory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: ecb01d53fdb413121ce2 ("v3dv: refactor events")
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19458>
---
 src/broadcom/vulkan/v3dv_event.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/broadcom/vulkan/v3dv_event.c b/src/broadcom/vulkan/v3dv_event.c
index 56f916661aa..1d6656eecb6 100644
--- a/src/broadcom/vulkan/v3dv_event.c
+++ b/src/broadcom/vulkan/v3dv_event.c
@@ -367,9 +367,11 @@ v3dv_event_free_resources(struct v3dv_device *device)
       device->events.desc = NULL;
    }
 
-   vk_object_free(&device->vk, NULL,
-                  v3dv_device_memory_from_handle(device->events.mem));
-   device->events.mem = VK_NULL_HANDLE;
+   if (device->events.mem) {
+      vk_object_free(&device->vk, NULL,
+                     v3dv_device_memory_from_handle(device->events.mem));
+      device->events.mem = VK_NULL_HANDLE;
+   }
 
    v3dv_DestroyBuffer(v3dv_device_to_handle(device),
                       device->events.buffer, NULL);