From 29d173060e6eaea32dc79ca5f4be3a4e4dd43016 Mon Sep 17 00:00:00 2001
From: Boris Brezillon <boris.brezillon@collabora.com>
Date: Fri, 12 Dec 2025 14:31:21 +0100
Subject: [PATCH] panvk: Fix a memory leak in the descriptor set logic

The desc_heap field is unconditionally initialized, so we need to
call util_vma_heap_finish() on it.

Fixes: ec02137c865e ("panvk: Support DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT")
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38923>
---
 src/panfrost/vulkan/panvk_vX_descriptor_set.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/panfrost/vulkan/panvk_vX_descriptor_set.c b/src/panfrost/vulkan/panvk_vX_descriptor_set.c
index 1d70920b0b8..bb9315c1bec 100644
--- a/src/panfrost/vulkan/panvk_vX_descriptor_set.c
+++ b/src/panfrost/vulkan/panvk_vX_descriptor_set.c
@@ -307,6 +307,7 @@ panvk_destroy_descriptor_pool(struct panvk_device *device,
       util_vma_heap_finish(&pool->desc_heap);
       panvk_priv_bo_unref(pool->desc_bo);
    } else if (pool->host_only_mem) {
+      util_vma_heap_finish(&pool->desc_heap);
       vk_free2(&device->vk.alloc, pAllocator, (void *)pool->host_only_mem);
       pool->host_only_mem = 0;
    }