fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-09 08:20:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

panvk: Fix a memory leak in the descriptor set logic

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

Fixes: ec02137c86 ("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>
(cherry picked from commit 29d173060e)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39003>
This commit is contained in:
Boris Brezillon 2025-12-12 14:31:21 +01:00 • committed by Dylan Baker
parent 4a15deeda6
commit 58226fb70c
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -164,7 +164,7 @@
"description": "panvk: Fix a memory leak in the descriptor set logic",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "ec02137c865ee0d2104f64714a9a39be6e25bf52",
"notes": null

1
src/panfrost/vulkan/panvk_vX_descriptor_set.c
View file

@ -293,6 +293,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;
}