fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 11:08:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

anv: fixup alloc failure handling in reserved_array_pool

Browse source 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 806281f61f ("anv: add a new reserved pool for capture/release")
Reviewed-by: Rohan Garg <rohan.garg@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29057>
This commit is contained in:
Lionel Landwerlin 2024-05-01 18:57:29 +03:00 • committed by Marge Bot
parent 92337aff03
commit e260b16b11
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/intel/vulkan/anv_allocator.c
View file

@ -1112,20 +1112,26 @@ anv_state_reserved_array_pool_init(struct anv_state_reserved_array_pool *pool,
struct anv_state_pool *parent,
uint32_t count, uint32_t size, uint32_t alignment)
{
struct anv_device *device = parent->block_pool.device;
pool->pool = parent;
pool->count = count;
pool->size = size;
pool->stride = align(size, alignment);
pool->states = vk_zalloc(&pool->pool->block_pool.device->vk.alloc,
pool->states = vk_zalloc(&device->vk.alloc,
sizeof(BITSET_WORD) * BITSET_WORDS(pool->count), 8,
VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
if (pool->states == NULL)
return VK_ERROR_OUT_OF_HOST_MEMORY;
return vk_error(&device->vk, VK_ERROR_OUT_OF_HOST_MEMORY);
BITSET_SET_RANGE(pool->states, 0, pool->count - 1);
simple_mtx_init(&pool->mutex, mtx_plain);
pool->state = anv_state_pool_alloc(pool->pool, pool->stride * count, alignment);
if (pool->state.alloc_size == 0) {
vk_free(&device->vk.alloc, pool->states);
return vk_error(&device->vk, VK_ERROR_OUT_OF_DEVICE_MEMORY);
}
return VK_SUCCESS;
}