geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libdrm: drmGetMinorType: Add FreeBSD version 

Resolve the minor type based on the device node path.
The minor type is either in /dev/drm/X where X is the type or
in a Linux-compatible device node in /dev/dri/
This means we need the major number on FreeBSD so add it to the function
arguments.

Signed-off-by: Emmanuel Vadot <manu@FreeBSD.org>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
main
Emmanuel Vadot 2020-01-21 17:47:09 +01:00 committed by Emmanuel Vadot
parent 4fbcc9a6a7
commit c55a1e564c
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
xf86drm.c
View File

@ -515,8 +515,28 @@ static int drmGetMinorBase(int type)
}; };
} }
static int drmGetMinorType(int minor) static int drmGetMinorType(int major, int minor)
{ {
#ifdef __FreeBSD__
char name[SPECNAMELEN];
int id;
if (!devname_r(makedev(major, minor), S_IFCHR, name, sizeof(name)))
return -1;
if (sscanf(name, "drm/%d", &id) != 1) {
// If not in /dev/drm/ we have the type in the name
if (sscanf(name, "dri/card%d\n", &id) >= 1)
return DRM_NODE_PRIMARY;
else if (sscanf(name, "dri/control%d\n", &id) >= 1)
return DRM_NODE_CONTROL;
else if (sscanf(name, "dri/renderD%d\n", &id) >= 1)
return DRM_NODE_RENDER;
return -1;
}
minor = id;
#endif
int type = minor >> 6; int type = minor >> 6;
if (minor < 0) if (minor < 0)
@ -2812,7 +2832,7 @@ drm_public int drmGetNodeTypeFromFd(int fd)
return -1; return -1;
} }
type = drmGetMinorType(min); type = drmGetMinorType(maj, min);
if (type == -1) if (type == -1)
errno = ENODEV; errno = ENODEV;
return type; return type;
@ -3086,7 +3106,7 @@ static int drmParsePciBusInfo(int maj, int min, drmPciBusInfoPtr info)
struct drm_pciinfo pinfo; struct drm_pciinfo pinfo;
int fd, type; int fd, type;
type = drmGetMinorType(min); type = drmGetMinorType(maj, min);
if (type == -1) if (type == -1)
return -ENODEV; return -ENODEV;
@ -3252,7 +3272,7 @@ static int drmParsePciDeviceInfo(int maj, int min,
struct drm_pciinfo pinfo; struct drm_pciinfo pinfo;
int fd, type; int fd, type;
type = drmGetMinorType(min); type = drmGetMinorType(maj, min);
if (type == -1) if (type == -1)
return -ENODEV; return -ENODEV;
@ -3841,7 +3861,7 @@ drm_public int drmGetDevice2(int fd, uint32_t flags, drmDevicePtr *device)
if (!drmNodeIsDRM(maj, min) || !S_ISCHR(sbuf.st_mode)) if (!drmNodeIsDRM(maj, min) || !S_ISCHR(sbuf.st_mode))
return -EINVAL; return -EINVAL;
node_type = drmGetMinorType(min); node_type = drmGetMinorType(maj, min);
if (node_type == -1) if (node_type == -1)
return -ENODEV; return -ENODEV;
@ -4080,7 +4100,7 @@ drm_public char *drmGetDeviceNameFromFd2(int fd)
if (!drmNodeIsDRM(maj, min) || !S_ISCHR(sbuf.st_mode)) if (!drmNodeIsDRM(maj, min) || !S_ISCHR(sbuf.st_mode))
return NULL; return NULL;
node_type = drmGetMinorType(min); node_type = drmGetMinorType(maj, min);
if (node_type == -1) if (node_type == -1)
return NULL; return NULL;