From 4d87eb83daf8ecdb68ca6b6ece448712b9988b79 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 2 Feb 2024 09:08:04 -0500 Subject: [PATCH] zink: avoid infinite recursion on (very) small BAR systems in bo alloc this should only try a full reclaim if possible, not unconditionally cc: mesa-stable Part-of: (cherry picked from commit c6635c09d0d7808a959c8e1815516c203e38e7fb) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_bo.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 98922f33f66..da743b8040a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2474,7 +2474,7 @@ "description": "zink: avoid infinite recursion on (very) small BAR systems in bo alloc", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/zink/zink_bo.c b/src/gallium/drivers/zink/zink_bo.c index 7d4fa522b3e..d8a0e5a474c 100644 --- a/src/gallium/drivers/zink/zink_bo.c +++ b/src/gallium/drivers/zink/zink_bo.c @@ -622,6 +622,8 @@ zink_bo_create(struct zink_screen *screen, uint64_t size, unsigned alignment, en low_bound *= 2; //nvidia has fat textures or something unsigned vk_heap_idx = screen->info.mem_props.memoryTypes[mem_type_idx].heapIndex; reclaim_all = screen->info.mem_props.memoryHeaps[vk_heap_idx].size <= low_bound; + if (reclaim_all) + reclaim_all = clean_up_buffer_managers(screen); } entry = pb_slab_alloc_reclaimed(slabs, alloc_size, mem_type_idx, reclaim_all); if (!entry) {