40 lines
2.1 KiB
Diff
40 lines
2.1 KiB
Diff
|
From a077c14f150f1c4f670dce381ac2eb548f1a4ac2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alessandro Astone <ales.astone@gmail.com>
|
||
|
|
Date: Wed, 10 Jan 2024 17:24:30 +0100
|
||
|
|
Subject: [PATCH] zink: Fix resizable BAR detection logic
|
||
|
|
|
||
|
|
This was broken in two ways:
|
||
|
|
* When looking for the MAX biggest_ram it was actually comparing
|
||
|
|
a candidate against biggest_vis_ram
|
||
|
|
|
||
|
|
* mem_props.memoryTypes[] should be accessed with the memory type
|
||
|
|
index as found in heap_map
|
||
|
|
|
||
|
|
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10341
|
||
|
|
Cc: 23.3 <mesa-stable>
|
||
|
|
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26979>
|
||
|
|
---
|
||
|
|
src/gallium/drivers/zink/zink_screen.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
|
||
|
|
index 5a6d17cb4fa3..6697d7ab938c 100644
|
||
|
|
--- a/src/gallium/drivers/zink/zink_screen.c
|
||
|
|
+++ b/src/gallium/drivers/zink/zink_screen.c
|
||
|
|
@@ -3258,10 +3258,10 @@ zink_internal_create_screen(const struct pipe_screen_config *config, int64_t dev
|
||
|
|
{
|
||
|
|
uint64_t biggest_vis_vram = 0;
|
||
|
|
for (unsigned i = 0; i < screen->heap_count[ZINK_HEAP_DEVICE_LOCAL_VISIBLE]; i++)
|
||
|
|
- biggest_vis_vram = MAX2(biggest_vis_vram, screen->info.mem_props.memoryHeaps[screen->info.mem_props.memoryTypes[i].heapIndex].size);
|
||
|
|
+ biggest_vis_vram = MAX2(biggest_vis_vram, screen->info.mem_props.memoryHeaps[screen->info.mem_props.memoryTypes[screen->heap_map[ZINK_HEAP_DEVICE_LOCAL_VISIBLE][i]].heapIndex].size);
|
||
|
|
uint64_t biggest_vram = 0;
|
||
|
|
for (unsigned i = 0; i < screen->heap_count[ZINK_HEAP_DEVICE_LOCAL]; i++)
|
||
|
|
- biggest_vram = MAX2(biggest_vis_vram, screen->info.mem_props.memoryHeaps[screen->info.mem_props.memoryTypes[i].heapIndex].size);
|
||
|
|
+ biggest_vram = MAX2(biggest_vram, screen->info.mem_props.memoryHeaps[screen->info.mem_props.memoryTypes[screen->heap_map[ZINK_HEAP_DEVICE_LOCAL][i]].heapIndex].size);
|
||
|
|
/* determine if vis vram is roughly equal to total vram */
|
||
|
|
if (biggest_vis_vram > biggest_vram * 0.9)
|
||
|
|
screen->resizable_bar = true;
|
||
|
|
--
|
||
|
|
GitLab
|
||
|
|
|