OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv/hasvk: don't report error when intel_get_device_info_from_fd fails

Browse Source 
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 <lionel.g.landwerlin@intel.com>
Fixes: 3fd44345c4 ("intel: Skip ioctls for querying device info when hardware is unsupported")
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27294>
This commit is contained in:
Lionel Landwerlin
2024-01-26 15:59:21 +02:00
committed by Marge Bot
parent 02fe3c32cd
commit e121d873bd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/intel/vulkan/anv_device.c
View File

@@ -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;
}

2
src/intel/vulkan_hasvk/anv_device.c
View File

@@ -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;
}