f406a9fcf655ab28a44e146373cee8878bc667595ac4c46994ea604f.patch

From b4254667fa5e94143f6ea774be255bd93f433d57 Mon Sep 17 00:00:00 2001
From: Sean Paul <seanpaul@chromium.org>
Date: Tue, 18 Aug 2020 17:05:01 -0400
Subject: [PATCH] CHROMIUM: drm/print: rename drm_debug* to be more
 syslog-centric

In preparation for tracefs support, rename drm_debug related functions
to reflect that it targets the syslog. This will allow us to selectively
target syslog and/or tracefs.

No functional changes here.

Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-6-sean@poorly.run #v5

Changes in v5:
-Added to the set
Changes in v6:
-None
(am from https://patchwork.freedesktop.org/patch/386270/)
(also found at https://lore.kernel.org/r/20200818210510.49730-6-sean@poorly.run)

Downstream reason:
-Patchset needs more work to resolve dynamic debug conflicts and
 adoption upstream

BUG=b:193917467
TEST=Tested on volteer/zork/trogdor. Build tested on others

Change-Id: I95ed43599ebce89ddf93faac0932673d207b14e7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3035726
Reviewed-by: Gil Dekel <gildekel@chromium.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Drew Davenport <ddavenport@chromium.org>
Tested-by: Sean Paul <seanpaul@chromium.org>
Commit-Queue: Sean Paul <seanpaul@chromium.org>
---
 drivers/gpu/drm/drm_print.c | 14 +++++++-------
 include/drm/drm_print.h     | 13 +++++++++----
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
index 699b7dbffd7ba124da8179309e98c08f21a9ec16..d0133fb3b6172f5c5b50ce93fb97beb3c6709c36 100644
--- a/drivers/gpu/drm/drm_print.c
+++ b/drivers/gpu/drm/drm_print.c
@@ -36,11 +36,11 @@
 #include <drm/drm_print.h>
 
 /*
- * __drm_debug: Enable debug output.
+ * __drm_debug_syslog: Enable debug output to system logs
  * Bitmask of DRM_UT_x. See include/drm/drm_print.h for details.
  */
-unsigned long __drm_debug;
-EXPORT_SYMBOL(__drm_debug);
+unsigned long __drm_debug_syslog;
+EXPORT_SYMBOL(__drm_debug_syslog);
 
 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"
@@ -53,7 +53,7 @@ MODULE_PARM_DESC(debug, "Enable debug output, where each bit enables a debug cat
 "\t\tBit 8 (0x100) will enable DP messages (displayport code)");
 
 #if !defined(CONFIG_DRM_USE_DYNAMIC_DEBUG)
-module_param_named(debug, __drm_debug, ulong, 0600);
+module_param_named(debug, __drm_debug_syslog, ulong, 0600);
 #else
 /* classnames must match vals of enum drm_debug_category */
 DECLARE_DYNDBG_CLASSMAP(drm_debug_classes, DD_CLASS_TYPE_DISJOINT_BITS, 0,
@@ -69,7 +69,7 @@ DECLARE_DYNDBG_CLASSMAP(drm_debug_classes, DD_CLASS_TYPE_DISJOINT_BITS, 0,
 			"DRM_UT_DRMRES");
 
 static struct ddebug_class_param drm_debug_bitmap = {
-	.bits = &__drm_debug,
+	.bits = &__drm_debug_syslog,
 	.flags = "p",
 	.map = &drm_debug_classes,
 };
@@ -182,7 +182,7 @@ void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf)
 }
 EXPORT_SYMBOL(__drm_printfn_info);
 
-void __drm_printfn_dbg(struct drm_printer *p, struct va_format *vaf)
+void __drm_printfn_debug_syslog(struct drm_printer *p, struct va_format *vaf)
 {
 	const struct drm_device *drm = p->arg;
 	const struct device *dev = drm ? drm->dev : NULL;
@@ -201,7 +201,7 @@ void __drm_printfn_dbg(struct drm_printer *p, struct va_format *vaf)
 		printk(KERN_DEBUG "[" DRM_NAME "]%s%s %pV",
 		       prefix_pad, prefix, vaf);
 }
-EXPORT_SYMBOL(__drm_printfn_dbg);
+EXPORT_SYMBOL(__drm_printfn_debug_syslog);
 
 void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf)
 {
diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
index 9cc473e5d3531d71e5fda74121b9108dd85f41f1..0cf4f619afd908b081766c158447c93a49dfa343 100644
--- a/include/drm/drm_print.h
+++ b/include/drm/drm_print.h
@@ -38,7 +38,7 @@
 struct drm_device;
 
 /* Do *not* use outside of drm_print.[ch]! */
-extern unsigned long __drm_debug;
+extern unsigned long __drm_debug_syslog;
 
 /**
  * DOC: print
@@ -140,9 +140,14 @@ enum drm_debug_category {
 	DRM_UT_DRMRES
 };
 
+static inline bool drm_debug_syslog_enabled(enum drm_debug_category category)
+{
+	return unlikely(__drm_debug_syslog & category);
+}
+
 static inline bool drm_debug_enabled_raw(enum drm_debug_category category)
 {
-	return unlikely(__drm_debug & BIT(category));
+	return drm_debug_syslog_enabled(category);
 }
 
 #define drm_debug_enabled_instrumented(category)			\
@@ -184,7 +189,7 @@ void __drm_puts_coredump(struct drm_printer *p, const char *str);
 void __drm_printfn_seq_file(struct drm_printer *p, struct va_format *vaf);
 void __drm_puts_seq_file(struct drm_printer *p, const char *str);
 void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf);
-void __drm_printfn_dbg(struct drm_printer *p, struct va_format *vaf);
+void __drm_printfn_debug_syslog(struct drm_printer *p, struct va_format *vaf);
 void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf);
 
 __printf(2, 3)
@@ -330,7 +335,7 @@ static inline struct drm_printer drm_dbg_printer(struct drm_device *drm,
 						 const char *prefix)
 {
 	struct drm_printer p = {
-		.printfn = __drm_printfn_dbg,
+		.printfn = __drm_printfn_debug_syslog,
 		.arg = drm,
 		.prefix = prefix,
 		.category = category,
-- 
2.44.0.478.gd926399ef9-goog