Commit d2dda3bf authored by Jani Nikula's avatar Jani Nikula

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: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Acked-by: default avatarMaxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/246c0c275d05c919d959983e1784e3f7347f4540.1705410327.git.jani.nikula@intel.com
parent d50892a9
...@@ -124,7 +124,7 @@ static int __live_idle_pulse(struct intel_engine_cs *engine, ...@@ -124,7 +124,7 @@ static int __live_idle_pulse(struct intel_engine_cs *engine,
if (engine_sync_barrier(engine)) { if (engine_sync_barrier(engine)) {
struct drm_printer m = drm_err_printer(&engine->i915->drm, "pulse"); 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); intel_engine_dump(engine, &m, "%s", engine->name);
err = -ETIME; err = -ETIME;
...@@ -138,8 +138,8 @@ static int __live_idle_pulse(struct intel_engine_cs *engine, ...@@ -138,8 +138,8 @@ static int __live_idle_pulse(struct intel_engine_cs *engine,
if (!i915_active_is_idle(&p->active)) { if (!i915_active_is_idle(&p->active)) {
struct drm_printer m = drm_err_printer(&engine->i915->drm, "pulse"); struct drm_printer m = drm_err_printer(&engine->i915->drm, "pulse");
pr_err("%s: heartbeat pulse did not flush idle tasks\n", drm_printf(&m, "%s: heartbeat pulse did not flush idle tasks\n",
engine->name); engine->name);
i915_active_print(&p->active, &m); i915_active_print(&p->active, &m);
err = -EINVAL; err = -EINVAL;
......
...@@ -158,7 +158,7 @@ static int live_active_wait(void *arg) ...@@ -158,7 +158,7 @@ static int live_active_wait(void *arg)
if (!READ_ONCE(active->retired)) { if (!READ_ONCE(active->retired)) {
struct drm_printer p = drm_err_printer(&i915->drm, __func__); 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); i915_active_print(&active->base, &p);
err = -EINVAL; err = -EINVAL;
...@@ -191,7 +191,7 @@ static int live_active_retire(void *arg) ...@@ -191,7 +191,7 @@ static int live_active_retire(void *arg)
if (!READ_ONCE(active->retired)) { if (!READ_ONCE(active->retired)) {
struct drm_printer p = drm_err_printer(&i915->drm, __func__); 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); i915_active_print(&active->base, &p);
err = -EINVAL; err = -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment