Add drmGetDeviceNameFromFd function

Determines the /dev filename of the drm fd argument.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d044474d42f6918de2f4b88af762650451034b5a..4e4882ab7d2144104769677dcd252db1f7f72d53 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -40,6 +40,7 @@ TESTS =                                               \
        getstats                                \
        setversion                              \
        updatedraw                              \
+       name_from_fd                            \
        $(NULL)
 
 if HAVE_INTEL

diff --git a/tests/name_from_fd.c b/tests/name_from_fd.c
new file mode 100644 (file)
index 0000000..330c8ff
--- /dev/null
+++ b/tests/name_from_fd.c
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Kristian Høgsberg <krh@bitplanet.net>
+ *
+ */
+
+#include <unistd.h>
+#include <fcntl.h>
+#include <limits.h>
+#include "drmtest.h"
+
+/**
+ * Checks drmGetDeviceNameFromFd
+ *
+ * This tests that we can get the actual version out, and that setting invalid
+ * major/minor numbers fails appropriately.  It does not check the actual
+ * behavior differenses resulting from an increased DI version.
+ */
+int main(int argc, char **argv)
+{
+       int fd, ret;
+       drm_set_version_t sv, version;
+       const char *name = "/dev/dri/card0";
+       char *v;
+
+       fd = open("/dev/dri/card0", O_RDWR);
+       if (fd == -1)
+               return 0;
+
+       v = drmGetDeviceNameFromFd(fd);
+       close(fd);
+
+       assert(strcmp(name, v) == 0);
+       drmFree(v);
+
+       return 0;
+}

diff --git a/xf86drm.c b/xf86drm.c
index 26dd81291ba7f178dd1ee18ad0a599c1277c9c11..364fe17df73fd30f5eddaba3098402c7e506e054 100644 (file)
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -2510,3 +2510,29 @@ int drmDropMaster(int fd)
        ret = ioctl(fd, DRM_IOCTL_DROP_MASTER, 0);
        return ret;
 }
+
+char *drmGetDeviceNameFromFd(int fd)
+{
+       char name[128];
+       struct stat sbuf;
+       dev_t d;
+       int i;
+
+       /* The whole drmOpen thing is a fiasco and we need to find a way
+        * back to just using open(2).  For now, however, lets just make
+        * things worse with even more ad hoc directory walking code to
+        * discover the device file name. */
+
+       fstat(fd, &sbuf);
+       d = sbuf.st_rdev;
+
+       for (i = 0; i < DRM_MAX_MINOR; i++) {
+               snprintf(name, sizeof name, DRM_DEV_NAME, DRM_DIR_NAME, i);
+               if (stat(name, &sbuf) == 0 && sbuf.st_rdev == d)
+                       break;
+       }
+       if (i == DRM_MAX_MINOR)
+               return NULL;
+
+       return drmStrdup(name);
+}

diff --git a/xf86drm.h b/xf86drm.h
index cf7d132938583820ebb51d1eb8d919611a3a434c..f0dfb88ea305540a0cf500c89521d0a5750b063e 100644 (file)
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -708,4 +708,6 @@ typedef struct _drmEventContext {
 
 extern int drmHandleEvent(int fd, drmEventContextPtr evctx);
 
+extern char *drmGetDeviceNameFromFd(int fd);
+
 #endif