Mesa (master): radv: don't report error with other vendor DRM devices
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed May 6 06:55:55 UTC 2020
Module: Mesa
Branch: master
Commit: 8d993c9d2c23d70d48248c9a8f8bc2855e12b18f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d993c9d2c23d70d48248c9a8f8bc2855e12b18f
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date: Wed Apr 29 13:23:22 2020 +0200
radv: don't report error with other vendor DRM devices
Enumeration should just skip unsupported DRM devices.
Cc: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4806>
---
src/amd/vulkan/radv_device.c | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index a28440e5fe3..6fd80ad16a0 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -746,7 +746,7 @@ radv_enumerate_physical_devices(struct radv_instance *instance)
{
/* TODO: Check for more devices ? */
drmDevicePtr devices[8];
- VkResult result = VK_ERROR_INCOMPATIBLE_DRIVER;
+ VkResult result = VK_SUCCESS;
int max_devices;
instance->physicalDeviceCount = 0;
@@ -770,7 +770,7 @@ radv_enumerate_physical_devices(struct radv_instance *instance)
radv_logi("Found %d drm nodes", max_devices);
if (max_devices < 1)
- return vk_error(instance, VK_ERROR_INCOMPATIBLE_DRIVER);
+ return vk_error(instance, VK_SUCCESS);
for (unsigned i = 0; i < (unsigned)max_devices; i++) {
if (devices[i]->available_nodes & 1 << DRM_NODE_RENDER &&
@@ -781,14 +781,22 @@ radv_enumerate_physical_devices(struct radv_instance *instance)
instance->physicalDeviceCount,
instance,
devices[i]);
- if (result == VK_SUCCESS)
- ++instance->physicalDeviceCount;
- else if (result != VK_ERROR_INCOMPATIBLE_DRIVER)
+ /* Incompatible DRM device, skip. */
+ if (result == VK_ERROR_INCOMPATIBLE_DRIVER) {
+ result = VK_SUCCESS;
+ continue;
+ }
+
+ /* Error creating the physical device, report the error. */
+ if (result != VK_SUCCESS)
break;
+
+ ++instance->physicalDeviceCount;
}
}
drmFreeDevices(devices, max_devices);
+ /* If we successfully enumerated any devices, call it success */
return result;
}
@@ -802,8 +810,7 @@ VkResult radv_EnumeratePhysicalDevices(
if (instance->physicalDeviceCount < 0) {
result = radv_enumerate_physical_devices(instance);
- if (result != VK_SUCCESS &&
- result != VK_ERROR_INCOMPATIBLE_DRIVER)
+ if (result != VK_SUCCESS)
return result;
}
@@ -829,8 +836,7 @@ VkResult radv_EnumeratePhysicalDeviceGroups(
if (instance->physicalDeviceCount < 0) {
result = radv_enumerate_physical_devices(instance);
- if (result != VK_SUCCESS &&
- result != VK_ERROR_INCOMPATIBLE_DRIVER)
+ if (result != VK_SUCCESS)
return result;
}
More information about the mesa-commit
mailing list