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

llvmpipe: handle vma allocation failure

Browse source 
Fixes: a062544d3d ("llvmpipe: Use an anonymous file for memory allocations")

Reviewed-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30229>
(cherry picked from commit a8ff1bdc83)
This commit is contained in:
Mike Blumenkrantz 2024-07-17 12:36:45 -04:00 • committed by Eric Engestrom
parent dd3f21e8a2
commit d10fa7e4d3
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1224,7 +1224,7 @@
"description": "llvmpipe: handle vma allocation failure", "description": "llvmpipe: handle vma allocation failure",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": "a062544d3d0519aaa3845b7cfd79e925b9352a55", "because_sha": "a062544d3d0519aaa3845b7cfd79e925b9352a55",
"notes": null "notes": null

5
src/gallium/drivers/llvmpipe/lp_texture.c
View file

@ -1305,6 +1305,11 @@ llvmpipe_allocate_memory(struct pipe_screen *_screen, uint64_t size)
mtx_lock(&screen->mem_mutex); mtx_lock(&screen->mem_mutex);
mem->offset = util_vma_heap_alloc(&screen->mem_heap, mem->size, alignment); mem->offset = util_vma_heap_alloc(&screen->mem_heap, mem->size, alignment);
if (!mem->offset) {
mtx_unlock(&screen->mem_mutex);
FREE(mem);
return NULL;
}
if (mem->offset + mem->size > screen->mem_file_size) { if (mem->offset + mem->size > screen->mem_file_size) {
/* expand the anonymous file */ /* expand the anonymous file */