iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Jani Nikula 2024-01-16 15:07:33 +02:00
parent d50892a955
commit d2dda3bf5c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c
View File

@ -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;

4
drivers/gpu/drm/i915/selftests/i915_active.c
View File

@ -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;