Module: Mesa
Branch: master
Commit: 28e3ae344be1c49f50a521792966e0d98510075c
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=28e3ae344be1c49f50a521792966e0d98510075c
Author: Jonathan Gray <j...@jsg.id.au>
Date: Mon Dec 21 16:39:55 2015 +1100
loader: add a libdrm case for loader_get_device_name_for_fd
Use dev_node_from_fd() with HAVE_LIBDRM to provide an implmentation
of loader_get_device_name_for_fd() for non-linux systems that
use libdrm but don't have udev or sysfs.
Signed-off-by: Jonathan Gray <j...@jsg.id.au>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
---
src/loader/loader.c | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/src/loader/loader.c b/src/loader/loader.c
index 8634f45..522fba3 100644
--- a/src/loader/loader.c
+++ b/src/loader/loader.c
@@ -445,7 +445,7 @@ int loader_get_user_preferred_fd(int default_fd, int
*different_device)
}
#endif
-#if defined(HAVE_SYSFS)
+#if defined(HAVE_SYSFS) || defined(HAVE_LIBDRM)
static int
dev_node_from_fd(int fd, unsigned int *maj, unsigned int *min)
{
@@ -466,7 +466,9 @@ dev_node_from_fd(int fd, unsigned int *maj, unsigned int
*min)
return 0;
}
+#endif
+#if defined(HAVE_SYSFS)
static int
sysfs_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id)
{
@@ -671,6 +673,24 @@ sysfs_get_device_name_for_fd(int fd)
}
#endif
+#if defined(HAVE_LIBDRM)
+static char *
+drm_get_device_name_for_fd(int fd)
+{
+ unsigned int maj, min;
+ char buf[0x40];
+ int n;
+
+ if (dev_node_from_fd(fd, &maj, &min) < 0)
+ return NULL;
+
+ n = snprintf(buf, sizeof(buf), DRM_DEV_NAME, DRM_DIR_NAME, min);
+ if (n == -1 || n >= sizeof(buf))
+ return NULL;
+
+ return strdup(buf);
+}
+#endif
char *
loader_get_device_name_for_fd(int fd)
@@ -685,6 +705,10 @@ loader_get_device_name_for_fd(int fd)
if ((result = sysfs_get_device_name_for_fd(fd)))
return result;
#endif
+#if HAVE_LIBDRM
+ if ((result = drm_get_device_name_for_fd(fd)))
+ return result;
+#endif
return result;
}
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
