drm/i915: use drm_printf() with the drm_err_printer intead of pr_err()

There's already a related drm_printer. Use it to preserve the context
instead of a separate pr_err().

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/246c0c275d05c919d959983e1784e3f7347f4540.1705410327.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c b/drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c
index be827318275c27bbaac6513b3597215fafcc79d0..ef014df4c4fccc1b0855459196520cbf78c7261b 100644 (file)
--- a/drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c
+++ b/drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c
@@ -124,7 +124,7 @@ static int __live_idle_pulse(struct intel_engine_cs *engine,
        if (engine_sync_barrier(engine)) {
                struct drm_printer m = drm_err_printer(&engine->i915->drm, "pulse");
 
-               pr_err("%s: no heartbeat pulse?\n", engine->name);
+               drm_printf(&m, "%s: no heartbeat pulse?\n", engine->name);
                intel_engine_dump(engine, &m, "%s", engine->name);
 
                err = -ETIME;
@@ -138,8 +138,8 @@ static int __live_idle_pulse(struct intel_engine_cs *engine,
        if (!i915_active_is_idle(&p->active)) {
                struct drm_printer m = drm_err_printer(&engine->i915->drm, "pulse");
 
-               pr_err("%s: heartbeat pulse did not flush idle tasks\n",
-                      engine->name);
+               drm_printf(&m, "%s: heartbeat pulse did not flush idle tasks\n",
+                          engine->name);
                i915_active_print(&p->active, &m);
 
                err = -EINVAL;

diff --git a/drivers/gpu/drm/i915/selftests/i915_active.c b/drivers/gpu/drm/i915/selftests/i915_active.c
index 8886752ade63830b78d5d26dcd0e7269f1ff8cb3..0d89d70b9c362ab2e207e4e8b9f6697735b207fd 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/i915_active.c
+++ b/drivers/gpu/drm/i915/selftests/i915_active.c
@@ -158,7 +158,7 @@ static int live_active_wait(void *arg)
        if (!READ_ONCE(active->retired)) {
                struct drm_printer p = drm_err_printer(&i915->drm, __func__);
 
-               pr_err("i915_active not retired after waiting!\n");
+               drm_printf(&p, "i915_active not retired after waiting!\n");
                i915_active_print(&active->base, &p);
 
                err = -EINVAL;
@@ -191,7 +191,7 @@ static int live_active_retire(void *arg)
        if (!READ_ONCE(active->retired)) {
                struct drm_printer p = drm_err_printer(&i915->drm, __func__);
 
-               pr_err("i915_active not retired after flushing!\n");
+               drm_printf(&p, "i915_active not retired after flushing!\n");
                i915_active_print(&active->base, &p);
 
                err = -EINVAL;