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

panvk: Support DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT

Browse source 
Reviewed-by: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36002>
This commit is contained in:
Christoph Pillmayer 2025-07-08 12:15:23 +00:00 • committed by Marge Bot
parent b5a91e537a
commit ec02137c86
2 changed files with 48 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/panfrost/vulkan/panvk_descriptor_set.h
View file

@ -61,6 +61,8 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(panvk_descriptor_set, base, VkDescriptorSet,
struct panvk_descriptor_pool { struct panvk_descriptor_pool {
struct vk_object_base base; struct vk_object_base base;
struct panvk_priv_bo *desc_bo; struct panvk_priv_bo *desc_bo;
/* Set if the pool was created with VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_EXT. */
uintptr_t host_only_mem;
struct util_vma_heap desc_heap; struct util_vma_heap desc_heap;
/* Initialize to ones */ /* Initialize to ones */

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

@ -264,7 +264,9 @@ panvk_desc_pool_free_set(struct panvk_descriptor_pool *pool,
if (!BITSET_TEST(pool->free_sets, set_idx)) { if (!BITSET_TEST(pool->free_sets, set_idx)) {
if (set->desc_count) if (set->desc_count)
util_vma_heap_free(&pool->desc_heap, set->descs.dev, util_vma_heap_free(
&pool->desc_heap,
pool->host_only_mem ? (uintptr_t)set->descs.host : set->descs.dev,
set->desc_count * PANVK_DESCRIPTOR_SIZE); set->desc_count * PANVK_DESCRIPTOR_SIZE);
BITSET_SET(pool->free_sets, set_idx); BITSET_SET(pool->free_sets, set_idx);
@ -290,11 +292,47 @@ panvk_destroy_descriptor_pool(struct panvk_device *device,
if (pool->desc_bo) { if (pool->desc_bo) {
util_vma_heap_finish(&pool->desc_heap); util_vma_heap_finish(&pool->desc_heap);
panvk_priv_bo_unref(pool->desc_bo); panvk_priv_bo_unref(pool->desc_bo);
} else if (pool->host_only_mem) {
vk_free2(&device->vk.alloc, pAllocator, (void *)pool->host_only_mem);
pool->host_only_mem = 0;
} }
vk_object_free(&device->vk, pAllocator, pool); vk_object_free(&device->vk, pAllocator, pool);
} }
static VkResult
panvk_init_pool_memory(struct panvk_device *device,
struct panvk_descriptor_pool *pool,
const VkDescriptorPoolCreateInfo *pCreateInfo,
uint64_t pool_size,
const VkAllocationCallbacks *pAllocator)
{
if (!(pCreateInfo->flags & VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_EXT)) {
VkResult result = panvk_priv_bo_create(device, pool_size, 0,
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT,
&pool->desc_bo);
if (result != VK_SUCCESS)
return result;
uint64_t bo_size = pool->desc_bo->bo->size;
assert(pool_size <= bo_size);
util_vma_heap_init(&pool->desc_heap, pool->desc_bo->addr.dev, bo_size);
} else {
void *pool_mem = vk_alloc2(&device->vk.alloc, pAllocator, pool_size, 8,
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
if (!pool_mem)
return VK_ERROR_OUT_OF_HOST_MEMORY;
/* A host-only pool has no bo backing it. */
pool->desc_bo = NULL;
pool->host_only_mem = (uintptr_t)pool_mem;
util_vma_heap_init(&pool->desc_heap, pool->host_only_mem, pool_size);
}
return VK_SUCCESS;
}
VkResult VkResult
panvk_per_arch(CreateDescriptorPool)( panvk_per_arch(CreateDescriptorPool)(
VkDevice _device, const VkDescriptorPoolCreateInfo *pCreateInfo, VkDevice _device, const VkDescriptorPoolCreateInfo *pCreateInfo,
@ -337,16 +375,12 @@ panvk_per_arch(CreateDescriptorPool)(
desc_count += pool->max_sets; desc_count += pool->max_sets;
uint64_t pool_size = desc_count * PANVK_DESCRIPTOR_SIZE; uint64_t pool_size = desc_count * PANVK_DESCRIPTOR_SIZE;
VkResult result = panvk_priv_bo_create(device, pool_size, 0, VkResult result = panvk_init_pool_memory(device, pool, pCreateInfo,
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT, pool_size, pAllocator);
&pool->desc_bo);
if (result != VK_SUCCESS) { if (result != VK_SUCCESS) {
panvk_destroy_descriptor_pool(device, pAllocator, pool); panvk_destroy_descriptor_pool(device, pAllocator, pool);
return result; return result;
} }
uint64_t bo_size = pool->desc_bo->bo->size;
assert(pool_size <= bo_size);
util_vma_heap_init(&pool->desc_heap, pool->desc_bo->addr.dev, bo_size);
} }
*pDescriptorPool = panvk_descriptor_pool_to_handle(pool); *pDescriptorPool = panvk_descriptor_pool_to_handle(pool);
@ -499,6 +533,10 @@ panvk_desc_pool_allocate_set(struct panvk_descriptor_pool *pool,
set->descs.dev = descs_dev_addr; set->descs.dev = descs_dev_addr;
set->descs.host = set->descs.host =
pool->desc_bo->addr.host + set->descs.dev - pool->desc_bo->addr.dev; pool->desc_bo->addr.host + set->descs.dev - pool->desc_bo->addr.dev;
} else {
/* This cast is fine because the heap is initialized from a host
* pointer in case of a host only pool. */
set->descs.host = (void *)(uintptr_t)descs_dev_addr;
} }
desc_set_write_immutable_samplers(set, variable_count); desc_set_write_immutable_samplers(set, variable_count);
BITSET_CLEAR(pool->free_sets, first_free_set - 1); BITSET_CLEAR(pool->free_sets, first_free_set - 1);