On Tue, 2024-01-16 at 15:07 +0200, Jani Nikula wrote:
> 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@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c | 6 +++---
> drivers/gpu/drm/i915/selftests/i915_active.c | 4 ++--
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c b/drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c
> index be827318275c..ef014df4c4fc 100644
> --- 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 8886752ade63..0d89d70b9c36 100644
> --- 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;
Reviewed-by: Luca Coelho <luciano.coelho@xxxxxxxxx>
--
Cheers,
Luca.
