Module Name: src
Committed By: riastradh
Date: Wed Dec 29 23:59:38 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_print.c
Log Message:
drm: Restore hw.drm2.debug sysctl knob, previously lost in merge.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/dist/drm/drm_print.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_print.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_print.c:1.15 src/sys/external/bsd/drm2/dist/drm/drm_print.c:1.16
--- src/sys/external/bsd/drm2/dist/drm/drm_print.c:1.15 Sun Dec 19 12:43:22 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_print.c Wed Dec 29 23:59:37 2021
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: drm_print.c,
#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 @@ __KERNEL_RCSID(0, "$NetBSD: drm_print.c,
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 @@ MODULE_PARM_DESC(debug, "Enable debug ou
"\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
