diff --git a/.pick_status.json b/.pick_status.json index 25ac46d9874..f7b05c63059 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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 diff --git a/src/panfrost/vulkan/panvk_vX_descriptor_set.c b/src/panfrost/vulkan/panvk_vX_descriptor_set.c index 81a598576ad..4b5cc1a20f8 100644 --- a/src/panfrost/vulkan/panvk_vX_descriptor_set.c +++ b/src/panfrost/vulkan/panvk_vX_descriptor_set.c @@ -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; }