[PATCH seatd v2] drm: Support drm-subtree drivers on FreeBSD
Export this patch
From: Jessica Clarke <jrtc27@jrtc27.com>
The drm-kmod drivers use linuxkpi and end up with /dev/drm being the
canonical path for the devices, but the drm-subtree drivers use drmkpi
which has them appear under /dev/dri like Linux. Thus, adapt path_is_drm
to recognise both on FreeBSD.
---
v2:
* Reverted merging function implementations
* Ran clang-format
common/drm.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/common/drm.c b/common/drm.c
index 45ed7e5..06d6720 100644
--- a/common/drm.c
+++ b/common/drm.c
@@ -10,7 +10,8 @@
#define DRM_IOCTL_SET_MASTER DRM_IO(0x1e)
#define DRM_IOCTL_DROP_MASTER DRM_IO(0x1f)
-#define STRLEN(s) ((sizeof(s) / sizeof(s[0])) - 1)
+#define STRLEN(s) ((sizeof(s) / sizeof(s[0])) - 1)
+#define STR_HAS_PREFIX(prefix, s) (strncmp(prefix, s, STRLEN(prefix)) == 0)
int drm_set_master(int fd) {
return ioctl(fd, DRM_IOCTL_SET_MASTER, 0);
@@ -22,15 +23,18 @@ int drm_drop_master(int fd) {
#if defined(__linux__) || defined(__NetBSD__)
int path_is_drm(const char *path) {
- static const char prefix[] = "/dev/dri/";
- static const int prefixlen = STRLEN(prefix);
- return strncmp(prefix, path, prefixlen) == 0;
+ if (STR_HAS_PREFIX("/dev/dri/", path))
+ return 1;
+ return 0;
}
#elif defined(__FreeBSD__)
int path_is_drm(const char *path) {
- static const char prefix[] = "/dev/drm/";
- static const int prefixlen = STRLEN(prefix);
- return strncmp(prefix, path, prefixlen) == 0;
+ if (STR_HAS_PREFIX("/dev/dri/", path))
+ return 1;
+ /* Some drivers have /dev/dri/X symlinked to /dev/drm/X */
+ if (STR_HAS_PREFIX("/dev/drm/", path))
+ return 1;
+ return 0;
}
#else
#error Unsupported platform
--
2.38.4
seatd/patches: SUCCESS in 1m43s
[drm: Support drm-subtree drivers on FreeBSD][0] v2 from [~jrtc27][1]
[0]: https://lists.sr.ht/~kennylevinsen/seatd-devel/patches/41355
[1]: mailto:jrtc27@jrtc27.com
✓ #994738 SUCCESS seatd/patches/freebsd.yml https://builds.sr.ht/~kennylevinsen/job/994738
✓ #994739 SUCCESS seatd/patches/netbsd.yml https://builds.sr.ht/~kennylevinsen/job/994739
✓ #994737 SUCCESS seatd/patches/archlinux.yml https://builds.sr.ht/~kennylevinsen/job/994737
✓ #994736 SUCCESS seatd/patches/alpine.yml https://builds.sr.ht/~kennylevinsen/job/994736
Applied, thanks!