From: Rob Clark <robdclark@chromium.org>
Date: Wed, 1 Mar 2023 19:24:06 +0000 (-0800)
Subject: vk/runtime: Use libdrm shim
X-Git-Tag: upstream/23.3.3~12138
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e7511ea7fd5c480c639ae31806313cb6ccbc150;p=platform%2Fupstream%2Fmesa.git

vk/runtime: Use libdrm shim

Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21636>
---

diff --git a/src/vulkan/runtime/vk_instance.c b/src/vulkan/runtime/vk_instance.c
index 3f00199..1a471eb6 100644
--- a/src/vulkan/runtime/vk_instance.c
+++ b/src/vulkan/runtime/vk_instance.c
@@ -23,9 +23,7 @@
 
 #include "vk_instance.h"
 
-#ifdef HAVE_LIBDRM
-#include <xf86drm.h>
-#endif
+#include "util/libdrm.h"
 
 #include "vk_alloc.h"
 #include "vk_common_entrypoints.h"
@@ -361,7 +359,6 @@ vk_instance_get_physical_device_proc_addr(const struct vk_instance *instance,
 static VkResult
 enumerate_drm_physical_devices_locked(struct vk_instance *instance)
 {
-#ifdef HAVE_LIBDRM
    /* TODO: Check for more devices ? */
    drmDevicePtr devices[8];
    int max_devices = drmGetDevices2(0, devices, ARRAY_SIZE(devices));
@@ -389,8 +386,6 @@ enumerate_drm_physical_devices_locked(struct vk_instance *instance)
 
    drmFreeDevices(devices, max_devices);
    return result;
-#endif
-   return VK_SUCCESS;
 }
 
 static VkResult