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

device_select_layer: pick a default device before applying DRI_PRIME

Browse source 
This ensures DRI_PRIME works if there are multiple CPU devices available

Suggested by @pepp

Fixes: afa1fba1 ("vulkan/device_select: don't pick a cpu driver as the default")

Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19101>
This commit is contained in:
Luna Nova 2023-01-15 16:12:59 -08:00 • committed by Mike Blumenkrantz
parent f958a45a71
commit 571ce2e481
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/vulkan/device-select-layer/device_select_layer.c
View file

@ -453,8 +453,17 @@ static uint32_t get_default_device(const struct instance_info *info,
else
default_idx = device_select_find_boot_vga_vid_did(pci_infos, physical_device_count);
}
if (default_idx == -1 && cpu_count)
/* If no GPU has been selected so far, select the first non-CPU device. If none are available,
* pick the first CPU device.
*/
if (default_idx == -1) {
default_idx = device_select_find_non_cpu(pci_infos, physical_device_count);
if (default_idx != -1) {
/* device_select_find_non_cpu picked a default, do nothing */
} else if (cpu_count) {
default_idx = 0;
}
}
/* DRI_PRIME=1 handling - pick any other device than default. */
if (default_idx != -1 && dri_prime_is_one && physical_device_count > (cpu_count + 1)) {
default_idx = find_non_cpu_skip(pci_infos, physical_device_count, default_idx);