[src/trunk]: src/sys/external/bsd/drm2/dist/drm drm: Restore hw.drm2.debug sy...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/68dd194bfff0
branches:  trunk
changeset: 1029281:68dd194bfff0
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Dec 29 23:59:37 2021 +0000

description:
drm: Restore hw.drm2.debug sysctl knob, previously lost in merge.

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_print.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r 552b846b434f -r 68dd194bfff0 sys/external/bsd/drm2/dist/drm/drm_print.c
--- a/sys/external/bsd/drm2/dist/drm/drm_print.c        Wed Dec 29 22:22:12 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_print.c        Wed Dec 29 23:59:37 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_print.c,v 1.15 2021/12/19 12:43:22 riastradh Exp $ */
+/*     $NetBSD: drm_print.c,v 1.16 2021/12/29 23:59:37 riastradh Exp $ */
 
 /*
  * Copyright (C) 2016 Red Hat
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_print.c,v 1.15 2021/12/19 12:43:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_print.c,v 1.16 2021/12/29 23:59:37 riastradh Exp $");
 
 #ifndef __NetBSD__             /* XXX ??? */
 #define DEBUG /* for pr_debug() */
@@ -41,10 +41,10 @@
 #include <sys/pserialize.h>
 #else
 #include <stdarg.h>
+#endif
 
 #include <linux/io.h>
 #include <linux/moduleparam.h>
-#endif
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 
@@ -59,7 +59,6 @@
 unsigned int __drm_debug;
 EXPORT_SYMBOL(__drm_debug);
 
-#ifndef __NetBSD__
 MODULE_PARM_DESC(debug, "Enable debug output, where each bit enables a debug category.\n"
 "\t\tBit 0 (0x01)  will enable CORE messages (drm core code)\n"
 "\t\tBit 1 (0x02)  will enable DRIVER messages (drm controller code)\n"
@@ -70,7 +69,6 @@
 "\t\tBit 7 (0x80)  will enable LEASE messages (leasing code)\n"
 "\t\tBit 8 (0x100) will enable DP messages (displayport code)");
 module_param_named(debug, __drm_debug, int, 0600);
-#endif
 
 #ifdef __NetBSD__
 static void