From db82d90451b3af4487930044152657aaef438703 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 13 Oct 2021 18:53:13 +0200 Subject: [PATCH] radv: report error messages when the driver can't be initialized Not only with RADV_DEBUG=startup. Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/radv_device.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 8d32639410b..0aa03c9cd23 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -577,31 +577,24 @@ radv_physical_device_try_create(struct radv_instance *instance, drmDevicePtr drm fd = open(path, O_RDWR | O_CLOEXEC); if (fd < 0) { - if (instance->debug_flags & RADV_DEBUG_STARTUP) - radv_logi("Could not open device '%s'", path); - - return vk_error(instance, VK_ERROR_INCOMPATIBLE_DRIVER); + return vk_errorf(instance, VK_ERROR_INCOMPATIBLE_DRIVER, + "Could not open device %s: %m", path); } version = drmGetVersion(fd); if (!version) { close(fd); - if (instance->debug_flags & RADV_DEBUG_STARTUP) - radv_logi("Could not get the kernel driver version for device '%s'", path); - - return vk_errorf(instance, VK_ERROR_INCOMPATIBLE_DRIVER, "failed to get version %s: %m", - path); + return vk_errorf(instance, VK_ERROR_INCOMPATIBLE_DRIVER, + "Could not get the kernel driver version for device %s: %m", path); } if (strcmp(version->name, "amdgpu")) { drmFreeVersion(version); close(fd); - if (instance->debug_flags & RADV_DEBUG_STARTUP) - radv_logi("Device '%s' is not using the amdgpu kernel driver.", path); - - return VK_ERROR_INCOMPATIBLE_DRIVER; + return vk_errorf(instance, VK_ERROR_INCOMPATIBLE_DRIVER, + "Device '%s' is not using the AMDGPU kernel driver: %m", path); } drmFreeVersion(version);