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

libdrm: Allow dynamic drm majors on linux 

To determine whether a device node is a drm device node or not, the code
currently compares the node's major number to the static drm major device
number.

This breaks the standalone vmwgfx driver on XWayland dri clients,
https://cgit.freedesktop.org/mesa/vmwgfx
and any future attempt to introduce dynamic device numbers for drm.

So instead of checking for the device major, instead check for the presence
of the /sys/dev/char/<major>:<minor>/device/drm directory.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Acked-by: Dave Airlie <airlied@redhat.com>
main
Thomas Hellstrom 2018-08-31 13:47:05 +02:00
parent 4f1c765396
commit f839258341
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
xf86drm.c
View File

@ -2767,6 +2767,20 @@ drm_public char *drmGetDeviceNameFromFd(int fd)
return strdup(name); return strdup(name);
} }
static bool drmNodeIsDRM(int maj, int min)
{
#ifdef __linux__
char path[64];
struct stat sbuf;
snprintf(path, sizeof(path), "/sys/dev/char/%d:%d/device/drm",
maj, min);
return stat(path, &sbuf) == 0;
#else
return maj == DRM_MAJOR;
#endif
}
drm_public int drmGetNodeTypeFromFd(int fd) drm_public int drmGetNodeTypeFromFd(int fd)
{ {
struct stat sbuf; struct stat sbuf;
@ -2778,7 +2792,7 @@ drm_public int drmGetNodeTypeFromFd(int fd)
maj = major(sbuf.st_rdev); maj = major(sbuf.st_rdev);
min = minor(sbuf.st_rdev); min = minor(sbuf.st_rdev);
if (maj != DRM_MAJOR || !S_ISCHR(sbuf.st_mode)) { if (!drmNodeIsDRM(maj, min) || !S_ISCHR(sbuf.st_mode)) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
@ -2844,7 +2858,7 @@ static char *drmGetMinorNameForFD(int fd, int type)
maj = major(sbuf.st_rdev); maj = major(sbuf.st_rdev);
min = minor(sbuf.st_rdev); min = minor(sbuf.st_rdev);
if (maj != DRM_MAJOR || !S_ISCHR(sbuf.st_mode)) if (!drmNodeIsDRM(maj, min) || !S_ISCHR(sbuf.st_mode))
return NULL; return NULL;
snprintf(buf, sizeof(buf), "/sys/dev/char/%d:%d/device/drm", maj, min); snprintf(buf, sizeof(buf), "/sys/dev/char/%d:%d/device/drm", maj, min);
@ -2878,7 +2892,7 @@ static char *drmGetMinorNameForFD(int fd, int type)
maj = major(sbuf.st_rdev); maj = major(sbuf.st_rdev);
min = minor(sbuf.st_rdev); min = minor(sbuf.st_rdev);
if (maj != DRM_MAJOR || !S_ISCHR(sbuf.st_mode)) if (!drmNodeIsDRM(maj, min) || !S_ISCHR(sbuf.st_mode))
return NULL; return NULL;
switch (type) { switch (type) {
@ -3729,7 +3743,7 @@ process_device(drmDevicePtr *device, const char *d_name,
maj = major(sbuf.st_rdev); maj = major(sbuf.st_rdev);
min = minor(sbuf.st_rdev); min = minor(sbuf.st_rdev);
if (maj != DRM_MAJOR || !S_ISCHR(sbuf.st_mode)) if (!drmNodeIsDRM(maj, min) || !S_ISCHR(sbuf.st_mode))
return -1; return -1;
subsystem_type = drmParseSubsystemType(maj, min); subsystem_type = drmParseSubsystemType(maj, min);
@ -3843,7 +3857,7 @@ drm_public int drmGetDevice2(int fd, uint32_t flags, drmDevicePtr *device)
maj = major(sbuf.st_rdev); maj = major(sbuf.st_rdev);
min = minor(sbuf.st_rdev); min = minor(sbuf.st_rdev);
if (maj != DRM_MAJOR || !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(min);
@ -3909,7 +3923,7 @@ drm_public int drmGetDevice2(int fd, uint32_t flags, drmDevicePtr *device)
maj = major(sbuf.st_rdev); maj = major(sbuf.st_rdev);
min = minor(sbuf.st_rdev); min = minor(sbuf.st_rdev);
if (maj != DRM_MAJOR || !S_ISCHR(sbuf.st_mode)) if (!drmNodeIsDRM(maj, min) || !S_ISCHR(sbuf.st_mode))
return -EINVAL; return -EINVAL;
subsystem_type = drmParseSubsystemType(maj, min); subsystem_type = drmParseSubsystemType(maj, min);
@ -4070,7 +4084,7 @@ drm_public char *drmGetDeviceNameFromFd2(int fd)
maj = major(sbuf.st_rdev); maj = major(sbuf.st_rdev);
min = minor(sbuf.st_rdev); min = minor(sbuf.st_rdev);
if (maj != DRM_MAJOR || !S_ISCHR(sbuf.st_mode)) if (!drmNodeIsDRM(maj, min) || !S_ISCHR(sbuf.st_mode))
return NULL; return NULL;
snprintf(path, sizeof(path), "/sys/dev/char/%d:%d", maj, min); snprintf(path, sizeof(path), "/sys/dev/char/%d:%d", maj, min);
@ -4096,7 +4110,7 @@ drm_public char *drmGetDeviceNameFromFd2(int fd)
maj = major(sbuf.st_rdev); maj = major(sbuf.st_rdev);
min = minor(sbuf.st_rdev); min = minor(sbuf.st_rdev);
if (maj != DRM_MAJOR || !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(min);