f49d071ae350ea2ddd03356e7a230f42b669af8007f7c4450ecb04d1.patch

From d59cae6e3f3d6804e849507ccb73526c3d376396 Mon Sep 17 00:00:00 2001
From: Sean Paul <seanpaul@chromium.org>
Date: Tue, 18 Aug 2020 17:05:09 -0400
Subject: [PATCH] CHROMIUM: drm/atomic: Use debug category printer for atomic
 state printer

The atomic state is printed if the DRM_UT_STATE is active, but it's
printed at INFO level. This patch converts it to use the debug
category printer so:

a- it's consistent with other DRM_UT_STATE logging
b- it's properly routed through drm_trace when introduced

Signed-off-by: Sean Paul <seanpaul@chromium.org>

Changes in v6:
-Added to the set
(am from https://patchwork.freedesktop.org/patch/386278/)
(also found at https://lore.kernel.org/r/20200818210510.49730-14-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: I1521cc6be9a4ad16170321da90be8cadd0a4405f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3260470
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_atomic_uapi.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c
index 434f3d4cb8a2..a8986d20f33c 100644
--- a/drivers/gpu/drm/drm_atomic_uapi.c
+++ b/drivers/gpu/drm/drm_atomic_uapi.c
@@ -1422,6 +1422,12 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,
 	} else if (arg->flags & DRM_MODE_ATOMIC_NONBLOCK) {
 		ret = drm_atomic_nonblocking_commit(state);
 	} else {
+		if (drm_debug_enabled(DRM_UT_STATE)) {
+			struct drm_printer p;
+			p = drm_debug_category_printer(DRM_UT_STATE, "commit_state");
+			drm_atomic_print_new_state(state, &p);
+		}
+
 		ret = drm_atomic_commit(state);
 	}
 
-- 
2.36.1.255.ge46751e96f-goog