Module Name: src
Committed By: riastradh
Date: Sun Dec 19 09:52:09 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_ioctl.c
Log Message:
Port DRM_ATOMIC disabling code
Author: Maya Rashish <m...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.18 src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.19
--- src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c:1.18 Sun Dec 19 09:48:53 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_ioctl.c Sun Dec 19 09:52:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_ioctl.c,v 1.18 2021/12/19 09:48:53 riastradh Exp $ */
+/* $NetBSD: drm_ioctl.c,v 1.19 2021/12/19 09:52:09 riastradh Exp $ */
/*
* Created: Fri Jan 8 09:01:26 1999 by fa...@valinux.com
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_ioctl.c,v 1.18 2021/12/19 09:48:53 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_ioctl.c,v 1.19 2021/12/19 09:52:09 riastradh Exp $");
#include <linux/export.h>
#include <linux/nospec.h>
@@ -353,7 +353,11 @@ drm_setclientcap(struct drm_device *dev,
if (!drm_core_check_feature(dev, DRIVER_ATOMIC))
return -EOPNOTSUPP;
/* The modesetting DDX has a totally broken idea of atomic. */
+#ifdef __linux__
if (current->comm[0] == 'X' && req->value == 1) {
+#else
+ if (current->p_comm[0] == 'X' && req->value == 1) {
+#endif
pr_info("broken atomic modeset userspace detected, disabling atomic\n");
return -EOPNOTSUPP;
}
