Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm Port DRM_ATOMIC disabling code



details:   https://anonhg.NetBSD.org/src/rev/fe72b2ebba62
branches:  trunk
changeset: 1028226:fe72b2ebba62
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 09:52:09 2021 +0000

description:
Port DRM_ATOMIC disabling code


Author: Maya Rashish <maya%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_ioctl.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r c5995ebc7ddb -r fe72b2ebba62 sys/external/bsd/drm2/dist/drm/drm_ioctl.c
--- a/sys/external/bsd/drm2/dist/drm/drm_ioctl.c        Sun Dec 19 09:52:00 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_ioctl.c        Sun Dec 19 09:52:09 2021 +0000
@@ -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 faith%valinux.com@localhost
@@ -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 @@
                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;
                }



Home | Main Index | Thread Index | Old Index