CVS commit: src/sys/external/bsd/drm2/dist/drm

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Sun Dec 19 12:43:23 UTC 2021

Modified Files:
        src/sys/external/bsd/drm2/dist/drm: drm_print.c

Log Message:
drm: Use {} instead of [] for drm prints.

Using [] confuses dmesg timestamp parsing.  We should maybe fix that,
but this will serve for now.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 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.14 src/sys/external/bsd/drm2/dist/drm/drm_print.c:1.15
--- src/sys/external/bsd/drm2/dist/drm/drm_print.c:1.14	Sun Dec 19 12:40:43 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_print.c	Sun Dec 19 12:43:22 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm_print.c,v 1.14 2021/12/19 12:40:43 riastradh Exp $	*/
+/*	$NetBSD: drm_print.c,v 1.15 2021/12/19 12:43:22 riastradh Exp $	*/
 
 /*
  * Copyright (C) 2016 Red Hat
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_print.c,v 1.14 2021/12/19 12:40:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_print.c,v 1.15 2021/12/19 12:43:22 riastradh Exp $");
 
 #ifndef __NetBSD__		/* XXX ??? */
 #define DEBUG /* for pr_debug() */
@@ -207,7 +207,7 @@ EXPORT_SYMBOL(__drm_printfn_seq_file);
 void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf)
 {
 #ifdef __NetBSD__
-	dev_info(p->arg, "[" DRM_NAME "] ");
+	dev_info(p->arg, "{" DRM_NAME "} ");
 	vprintf(vaf->fmt, *vaf->va);	/* XXX */
 #else
 	dev_info(p->arg, "[" DRM_NAME "] %pV", vaf);
@@ -308,10 +308,12 @@ void drm_dev_printk(const struct device 
 	char symbuf[128];
 
 	drm_symstr((vaddr_t)__builtin_return_address(0), symbuf, sizeof symbuf);
-	if (dev)
-		printf("%s [" DRM_NAME ":%s] ", device_xname(__UNCONST(dev)), symbuf);
-	else
-		printf("[" DRM_NAME ":%s] ", symbuf);
+	if (dev) {
+		printf("%s {" DRM_NAME ":%s} ", device_xname(__UNCONST(dev)),
+		    symbuf);
+	} else {
+		printf("{" DRM_NAME ":%s} ", symbuf);
+	}
 
 	va_start(va, format);
 	vprintf(format, va);
@@ -347,10 +349,12 @@ void drm_dev_dbg(const struct device *de
 		return;
 
 	drm_symstr((vaddr_t)__builtin_return_address(0), symbuf, sizeof symbuf);
-	if (dev)
-		printf("%s [" DRM_NAME ":%s] ", device_xname(__UNCONST(dev)), symbuf);
-	else
-		printf("[" DRM_NAME ":%s] ", symbuf);
+	if (dev) {
+		printf("%s {" DRM_NAME ":%s} ", device_xname(__UNCONST(dev)),
+		    symbuf);
+	} else {
+		printf("{" DRM_NAME ":%s} ", symbuf);
+	}
 
 	va_start(va, format);
 	vprintf(format, va);
@@ -387,8 +391,9 @@ void __drm_dbg(enum drm_debug_category c
 	if (!(__drm_debug & category))
 		return;
 
+	memset(symbuf, 0, sizeof symbuf);
 	drm_symstr((vaddr_t)__builtin_return_address(0), symbuf, sizeof symbuf);
-	printf("[" DRM_NAME ":%s] ", symbuf);
+	printf("{" DRM_NAME ":%s} ", symbuf);
 
 	va_start(va, format);
 	vprintf(format, va);
@@ -419,7 +424,7 @@ void __drm_err(const char *format, ...)
 	va_list va;
 
 	drm_symstr((vaddr_t)__builtin_return_address(0), symbuf, sizeof symbuf);
-	printf("[" DRM_NAME ":%s] *ERROR* ", symbuf);
+	printf("{" DRM_NAME ":%s} *ERROR* ", symbuf);
 
 	va_start(va, format);
 	vprintf(format, va);