fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-21 03:48:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

v3dv: allow TFU readahead padding above maxMemoryAllocationSize
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
Our get_buffer/image_memory_requirements() pad TRANSFER_SRC resources
with V3D_TFU_READAHEAD_SIZE, so allocating the reported requirements of
a resource of exactly maxMemoryAllocationSize failed with
VK_ERROR_OUT_OF_DEVICE_MEMORY.

Accept up to one extra page over the limit: since the allocation size
is page-aligned, that covers any sub-page padding.

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/42179>
This commit is contained in:
Jose Maria Casanova Crespo 2026-06-11 14:30:21 +02:00 • committed by Marge Bot
parent 0c3a45c202
commit cdc6a0bfed
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/broadcom/vulkan/v3dv_device.c
View file

@ -2410,7 +2410,13 @@ v3dv_AllocateMemory(VkDevice _device,
assert(pAllocateInfo->sType == VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO);
const VkDeviceSize alloc_size = align64(pAllocateInfo->allocationSize, 4096);
if (unlikely(alloc_size > MAX_MEMORY_ALLOCATION_SIZE))
/* Our memory requirements pad TRANSFER_SRC resources with
* V3D_TFU_READAHEAD_SIZE (and UBO/SSBO with 4 bytes for ldunifa), so
* allocating the reported requirements of a resource of exactly
* maxMemoryAllocationSize must succeed. Accept one extra page over
* the limit, which covers any sub-page padding after alignment.
*/
if (unlikely(alloc_size > MAX_MEMORY_ALLOCATION_SIZE + 4096u))
return vk_error(device, VK_ERROR_OUT_OF_DEVICE_MEMORY);
uint64_t heap_used = p_atomic_read(&pdevice->heap_used);