fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-02 18:10:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

v3dv: don't return incompatible driver if GPU is not present

Browse source 
Instead, we should just return VK_SUCCESS. The physical device
won't be initialized and vkEnumeratePhysicalDevices will not
list it as available, which is the expected behavior here.

Also, VK_ERROR_INCOMPATIBLE_DRIVER is not a valid return code
from vkEnumeratePhysicalDevices, so never return that, instead
we return VK_ERROR_INITIALIZATION_FAILED if a valid device was
found but we failed to create the physical device for it.

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Tested-By: Ryan Houdek <Sonicadvance1@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18591>
This commit is contained in:
Iago Toral Quiroga 2022-09-14 08:44:28 +02:00 • committed by Marge Bot
parent 03294e1dd1
commit 591103d04d
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -786,7 +786,7 @@ create_physical_device(struct v3dv_instance *instance,
render_fd = open(path, O_RDWR | O_CLOEXEC);
if (render_fd < 0) {
fprintf(stderr, "Opening %s failed: %s\n", path, strerror(errno));
result = VK_ERROR_INCOMPATIBLE_DRIVER;
result = VK_ERROR_INITIALIZATION_FAILED;
goto fail;
}
@ -854,17 +854,20 @@ create_physical_device(struct v3dv_instance *instance,
device->master_fd = master_fd; /* Master vc4 primary node */
if (!v3d_get_device_info(device->render_fd, &device->devinfo, &v3dv_ioctl)) {
result = VK_ERROR_INCOMPATIBLE_DRIVER;
result = vk_errorf(instance, VK_ERROR_INITIALIZATION_FAILED,
"Failed to get info from device.");
goto fail;
}
if (device->devinfo.ver < 42) {
result = VK_ERROR_INCOMPATIBLE_DRIVER;
result = vk_errorf(instance, VK_ERROR_INITIALIZATION_FAILED,
"Device version < 42.");
goto fail;
}
if (!device_has_expected_features(device)) {
result = VK_ERROR_INCOMPATIBLE_DRIVER;
result = vk_errorf(instance, VK_ERROR_INITIALIZATION_FAILED,
"Kernel driver doesn't have required features.");
goto fail;
}
@ -960,6 +963,7 @@ create_physical_device(struct v3dv_instance *instance,
result = v3dv_wsi_init(device);
if (result != VK_SUCCESS) {
vk_error(instance, result);
result = VK_ERROR_INITIALIZATION_FAILED;
goto fail;
}
@ -983,6 +987,11 @@ fail:
return result;
}
/* This driver hook is expected to return VK_SUCCESS (unless a memory
* allocation error happened) if no compatible device is found. If a
* compatible device is found, it may return an error code if device
* inialization failed.
*/
static VkResult
enumerate_devices(struct vk_instance *vk_instance)
{
@ -991,12 +1000,13 @@ enumerate_devices(struct vk_instance *vk_instance)
/* TODO: Check for more devices? */
drmDevicePtr devices[8];
VkResult result = VK_ERROR_INCOMPATIBLE_DRIVER;
int max_devices;
max_devices = drmGetDevices2(0, devices, ARRAY_SIZE(devices));
if (max_devices < 1)
return VK_ERROR_INCOMPATIBLE_DRIVER;
return VK_SUCCESS;
VkResult result = VK_SUCCESS;
#if !using_v3d_simulator
int32_t v3d_idx = -1;
@ -1011,7 +1021,7 @@ enumerate_devices(struct vk_instance *vk_instance)
(devices[i]->deviceinfo.pci->vendor_id == 0x8086 ||
devices[i]->deviceinfo.pci->vendor_id == 0x1002)) {
result = create_physical_device(instance, devices[i], NULL);
if (result != VK_ERROR_INCOMPATIBLE_DRIVER)
if (result == VK_SUCCESS)
break;
}
#else
@ -1051,10 +1061,10 @@ enumerate_devices(struct vk_instance *vk_instance)
}
#if !using_v3d_simulator
if (v3d_idx == -1 || vc4_idx == -1)
result = VK_ERROR_INCOMPATIBLE_DRIVER;
else
result = create_physical_device(instance, devices[v3d_idx], devices[vc4_idx]);
if (v3d_idx != -1 && vc4_idx != -1) {
result =
create_physical_device(instance, devices[v3d_idx], devices[vc4_idx]);
}
#endif
drmFreeDevices(devices, max_devices);