From e121d873bdd57cd41626e3c37ae65a05662206d3 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Fri, 26 Jan 2024 15:59:21 +0200 Subject: [PATCH] anv/hasvk: don't report error when intel_get_device_info_from_fd fails MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A side effect of the previous change is that we started getting failures from that function but that only says the device is not supported, so silently fail and return. Signed-off-by: Lionel Landwerlin Fixes: 3fd44345c4 ("intel: Skip ioctls for querying device info when hardware is unsupported") Reviewed-by: José Roberto de Souza Part-of: --- src/intel/vulkan/anv_device.c | 2 +- src/intel/vulkan_hasvk/anv_device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 9b6b74027ed..773d5df60a4 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -2149,7 +2149,7 @@ anv_physical_device_try_create(struct vk_instance *vk_instance, struct intel_device_info devinfo; if (!intel_get_device_info_from_fd(fd, &devinfo, 9, -1)) { - result = vk_error(instance, VK_ERROR_INCOMPATIBLE_DRIVER); + result = VK_ERROR_INCOMPATIBLE_DRIVER; goto fail_fd; } diff --git a/src/intel/vulkan_hasvk/anv_device.c b/src/intel/vulkan_hasvk/anv_device.c index 3c45345503d..5eb8102ca16 100644 --- a/src/intel/vulkan_hasvk/anv_device.c +++ b/src/intel/vulkan_hasvk/anv_device.c @@ -990,7 +990,7 @@ anv_physical_device_try_create(struct vk_instance *vk_instance, struct intel_device_info devinfo; if (!intel_get_device_info_from_fd(fd, &devinfo, 7, 8)) { - result = vk_error(instance, VK_ERROR_INCOMPATIBLE_DRIVER); + result = VK_ERROR_INCOMPATIBLE_DRIVER; goto fail_fd; }