From 57c50cfc45f8c4f95bffff88ec7bcc056d3b23be Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Tue, 21 Jan 2020 17:53:07 +0100 Subject: [PATCH] libdrm: drmGetMinorNameForFD: Add FreeBSD variant Use the FreeBSD variant function to obtain the minor name and the device node. Return the correct path based on where the node is (drm/ versus dri/). Signed-off-by: Emmanuel Vadot Reviewed-by: Eric Engestrom Reviewed-by: Emil Velikov --- xf86drm.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/xf86drm.c b/xf86drm.c index e6f6a890..e7f441eb 100644 --- a/xf86drm.c +++ b/xf86drm.c @@ -2938,6 +2938,38 @@ static char *drmGetMinorNameForFD(int fd, int type) closedir(sysdir); return NULL; +#elif __FreeBSD__ + struct stat sbuf; + char dname[SPECNAMELEN]; + const char *mname; + char name[SPECNAMELEN]; + int id, maj, min; + + if (fstat(fd, &sbuf)) + return NULL; + + maj = major(sbuf.st_rdev); + min = minor(sbuf.st_rdev); + + if (!drmNodeIsDRM(maj, min) || !S_ISCHR(sbuf.st_mode)) + return NULL; + + if (!devname_r(sbuf.st_rdev, S_IFCHR, dname, sizeof(dname))) + return NULL; + + /* Handle both /dev/drm and /dev/dri + * FreeBSD on amd64/i386/powerpc external kernel modules create node in + * in /dev/drm/ and links in /dev/dri while a WIP in kernel driver creates + * only device nodes in /dev/dri/ */ + mname = drmGetMinorName(type); + if (sscanf(dname, "drm/%d", &id) != 1) { + snprintf(name, sizeof(name), "dri/%s", mname); + if (strncmp(name, dname, strlen(name)) != 0) + return NULL; + snprintf(name, sizeof(name), "/dev/%s", dname); + } else + snprintf(name, sizeof(name), DRM_DIR_NAME "/%s%d", mname, id); + return strdup(name); #else struct stat sbuf; char buf[PATH_MAX + 1];