From 5aa83dd6fa2bbfeb098877898d10261b2ec4f2d0 Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Tue, 28 Apr 2020 16:33:05 +0200 Subject: [PATCH] libdrm: drmGetDeviceNameFromFd: Always return /dev/dri/ node for FreeBSD Since we now always returns the /dev/dri/ node for drmGetDeviceNameFromFd, be consistant with the names returned in drmGetDeviceNameFromFd. Reviewed-by: Emil Velikov Signed-off-by: Emmanuel Vadot --- xf86drm.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/xf86drm.c b/xf86drm.c index 6fe0296f..b49d42f7 100644 --- a/xf86drm.c +++ b/xf86drm.c @@ -122,6 +122,7 @@ struct drm_pciinfo { static drmServerInfoPtr drm_server_info; static bool drmNodeIsDRM(int maj, int min); +static char *drmGetMinorNameForFD(int fd, int type); drm_public void drmSetServerInfo(drmServerInfoPtr info) { @@ -2776,24 +2777,16 @@ drm_public char *drmGetDeviceNameFromFd(int fd) { #ifdef __FreeBSD__ struct stat sbuf; - char dname[SPECNAMELEN]; - char name[SPECNAMELEN]; int maj, min; + int nodetype; 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; - - snprintf(name, sizeof(name), "/dev/%s", dname); - return strdup(name); + nodetype = drmGetMinorType(maj, min); + return drmGetMinorNameForFD(fd, nodetype); #else char name[128]; struct stat sbuf;