drm/i915: switch from drm_debug_printer() to device specific drm_dbg_printer()

Prefer the device specific debug printer.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Acked-by: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/f2614dfcba295be20c650cdab24c3979d265f422.1705410327.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index 9df9097a0255afda44013c13e2357357769005be..c874756d8b13b2be0b47730acc3331032a335188 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -383,7 +383,8 @@ int intel_display_driver_probe(struct drm_i915_private *i915)
 
 void intel_display_driver_register(struct drm_i915_private *i915)
 {
-       struct drm_printer p = drm_debug_printer("i915 display info:");
+       struct drm_printer p = drm_dbg_printer(&i915->drm, DRM_UT_KMS,
+                                              "i915 display info:");
 
        if (!HAS_DISPLAY(i915))
                return;

diff --git a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
index 1a8e2b7db0138f4928482f3ce8d1b42ff5b30cc3..0f6406f0cca0294ac38ca3a3fe40371c8ccfb555 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
@@ -96,7 +96,8 @@ static void heartbeat_commit(struct i915_request *rq,
 static void show_heartbeat(const struct i915_request *rq,
                           struct intel_engine_cs *engine)
 {
-       struct drm_printer p = drm_debug_printer("heartbeat");
+       struct drm_printer p = drm_dbg_printer(&rq->i915->drm, DRM_UT_DRIVER,
+                                              "heartbeat");
 
        if (!rq) {
                intel_engine_dump(engine, &p,

diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
index 6801f8b95c53d1ed989f6bb7c72205b2d7cd236a..c8e9aa41fdeac51e93a3490e0d4d1c59de551a51 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_reset.c
+++ b/drivers/gpu/drm/i915/gt/intel_reset.c
@@ -1015,7 +1015,8 @@ void intel_gt_set_wedged(struct intel_gt *gt)
        mutex_lock(&gt->reset.mutex);
 
        if (GEM_SHOW_DEBUG()) {
-               struct drm_printer p = drm_debug_printer(__func__);
+               struct drm_printer p = drm_dbg_printer(&gt->i915->drm,
+                                                      DRM_UT_DRIVER, __func__);
                struct intel_engine_cs *engine;
                enum intel_engine_id id;
 

diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
index 3eacbc50caf8d98fd92f45640cf64a5d106c9052..86756a252e203d2f39fa840d14365bdd40aa6489 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
@@ -1233,7 +1233,8 @@ static void __set_mcr_steering(struct i915_wa_list *wal,
 
 static void debug_dump_steering(struct intel_gt *gt)
 {
-       struct drm_printer p = drm_debug_printer("MCR Steering:");
+       struct drm_printer p = drm_dbg_printer(&gt->i915->drm, DRM_UT_DRIVER,
+                                              "MCR Steering:");
 
        if (drm_debug_enabled(DRM_UT_DRIVER))
                intel_gt_mcr_report_steering(&p, gt, false);

diff --git a/drivers/gpu/drm/i915/gt/selftest_context.c b/drivers/gpu/drm/i915/gt/selftest_context.c
index 47070cba7eb145688a37d09e0dfc26cead7ffe54..12eca750f7d012f24d05e2ff4d72aeaa7d97d4fa 100644 (file)
--- a/drivers/gpu/drm/i915/gt/selftest_context.c
+++ b/drivers/gpu/drm/i915/gt/selftest_context.c
@@ -285,7 +285,8 @@ out_engine:
        intel_engine_pm_flush(engine);
 
        if (intel_engine_pm_is_awake(engine)) {
-               struct drm_printer p = drm_debug_printer(__func__);
+               struct drm_printer p = drm_dbg_printer(&engine->i915->drm,
+                                                      DRM_UT_DRIVER, __func__);
 
                intel_engine_dump(engine, &p,
                                  "%s is still awake:%d after idle-barriers\n",

diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index c7d7c3b7ecc638f433b6b018c8b9562bf09eb0d6..c1cf5ba7ba14dd7b1bae04ba2aa5ed7693a50e8a 100644 (file)
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -681,7 +681,8 @@ i915_print_iommu_status(struct drm_i915_private *i915, struct drm_printer *p)
 static void i915_welcome_messages(struct drm_i915_private *dev_priv)
 {
        if (drm_debug_enabled(DRM_UT_DRIVER)) {
-               struct drm_printer p = drm_debug_printer("i915 device info:");
+               struct drm_printer p = drm_dbg_printer(&dev_priv->drm, DRM_UT_DRIVER,
+                                                      "device info:");
                struct intel_gt *gt;
                unsigned int i;