afd1d22e98ba300660e5cc753916d9f7683cacc6edd5822cf1546d88.patch

From c2f55c1b1a729940b18bbb6acf659e5543519662 Mon Sep 17 00:00:00 2001
From: Sean Paul <seanpaul@chromium.org>
Date: Tue, 18 Aug 2020 17:05:07 -0400
Subject: [PATCH] CHROMIUM: drm/mst: Convert debug printers to debug category
 printers

The printers in dp_mst are meant to be gated on DRM_UT_DP, so use the
debug category printer to avoid dumping mst transactions to the wrong
place.

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

Changes in v5:
-Added to the set
Changes in v6:
-None
Reviewed-by: Lyude Paul <lyude@redhat.com>
(am from https://patchwork.freedesktop.org/patch/386276/)
(also found at https://lore.kernel.org/r/20200818210510.49730-12-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: If341eca4761621ecf5f402a2c2ea906929bfe4af
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3260468
Reviewed-by: Drew Davenport <ddavenport@chromium.org>
Tested-by: Sean Paul <seanpaul@chromium.org>
Commit-Queue: Sean Paul <seanpaul@chromium.org>
---
 drivers/gpu/drm/display/drm_dp_mst_topology.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c
index 03d528209426214530bc81c752a7d6319f01168b..eab516051b7c7ba2a6464723659ab77fb7de8e89 100644
--- a/drivers/gpu/drm/display/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c
@@ -1306,8 +1306,8 @@ static int drm_dp_mst_wait_tx_reply(struct drm_dp_mst_branch *mstb,
 	}
 out:
 	if (unlikely(ret == -EIO) && drm_debug_enabled(DRM_UT_DP)) {
-		struct drm_printer p = drm_dbg_printer(mgr->dev, DRM_UT_DP,
-						       DBG_PREFIX);
+		struct drm_printer p = drm_debug_category_printer(DRM_UT_DP,
+								  DBG_PREFIX);
 
 		drm_dp_mst_dump_sideband_msg_tx(&p, txmsg);
 	}
@@ -2826,9 +2826,8 @@ static int process_single_tx_qlock(struct drm_dp_mst_topology_mgr *mgr,
 	ret = drm_dp_send_sideband_msg(mgr, up, chunk, idx);
 	if (ret) {
 		if (drm_debug_enabled(DRM_UT_DP)) {
-			struct drm_printer p = drm_dbg_printer(mgr->dev,
-							       DRM_UT_DP,
-							       DBG_PREFIX);
+			struct drm_printer p = drm_debug_category_printer(DRM_UT_DP,
+									  DBG_PREFIX);
 
 			drm_printf(&p, "sideband msg failed to send\n");
 			drm_dp_mst_dump_sideband_msg_tx(&p, txmsg);
@@ -2873,8 +2872,8 @@ static void drm_dp_queue_down_tx(struct drm_dp_mst_topology_mgr *mgr,
 	list_add_tail(&txmsg->next, &mgr->tx_msg_downq);
 
 	if (drm_debug_enabled(DRM_UT_DP)) {
-		struct drm_printer p = drm_dbg_printer(mgr->dev, DRM_UT_DP,
-						       DBG_PREFIX);
+		struct drm_printer p = drm_debug_category_printer(DRM_UT_DP,
+								  DBG_PREFIX);
 
 		drm_dp_mst_dump_sideband_msg_tx(&p, txmsg);
 	}
-- 
2.44.0.478.gd926399ef9-goog