Move away from generic pr prints to GT aware gt_* versions, which tag each message with device and the tile it came from.
Assisted-by: GitHub-Copilot:claude-opus-5 Signed-off-by: Krzysztof Karas <[email protected]> --- v5: * No changes since v4; .../drm/i915/gt/selftest_engine_heartbeat.c | 7 +++--- drivers/gpu/drm/i915/gt/selftest_llc.c | 25 ++++++++++++------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c b/drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c index b893a8fde895..1164dd4aea11 100644 --- a/drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c +++ b/drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c @@ -7,6 +7,7 @@ #include "i915_drv.h" +#include "intel_gt_print.h" #include "intel_gt_requests.h" #include "i915_selftest.h" #include "selftest_engine_heartbeat.h" @@ -202,7 +203,7 @@ static int __live_heartbeat_off(struct intel_engine_cs *engine) engine->serial++; flush_delayed_work(&engine->heartbeat.work); if (!delayed_work_pending(&engine->heartbeat.work)) { - pr_err("%s: heartbeat not running\n", + gt_err(engine->gt, "%s: heartbeat not running\n", engine->name); err = -EINVAL; goto err_pm; @@ -215,14 +216,14 @@ static int __live_heartbeat_off(struct intel_engine_cs *engine) engine->serial++; flush_delayed_work(&engine->heartbeat.work); if (delayed_work_pending(&engine->heartbeat.work)) { - pr_err("%s: heartbeat still running\n", + gt_err(engine->gt, "%s: heartbeat still running\n", engine->name); err = -EINVAL; goto err_beat; } if (READ_ONCE(engine->heartbeat.systole)) { - pr_err("%s: heartbeat still allocated\n", + gt_err(engine->gt, "%s: heartbeat still allocated\n", engine->name); err = -EINVAL; goto err_beat; diff --git a/drivers/gpu/drm/i915/gt/selftest_llc.c b/drivers/gpu/drm/i915/gt/selftest_llc.c index 779fadcec7c4..71ea688be154 100644 --- a/drivers/gpu/drm/i915/gt/selftest_llc.c +++ b/drivers/gpu/drm/i915/gt/selftest_llc.c @@ -3,6 +3,7 @@ * Copyright © 2019 Intel Corporation */ +#include "intel_gt_print.h" #include "selftest_llc.h" #include "intel_rps.h" @@ -22,8 +23,8 @@ static int gen6_verify_ring_freq(struct intel_llc *llc) for (gpu_freq = consts.min_gpu_freq; gpu_freq <= consts.max_gpu_freq; gpu_freq++) { + u32 scaler = GRAPHICS_VER(i915) >= 9 ? GEN9_FREQ_SCALER : 1; struct intel_rps *rps = &llc_to_gt(llc)->rps; - unsigned int ia_freq, ring_freq, found; u32 val; @@ -32,17 +33,21 @@ static int gen6_verify_ring_freq(struct intel_llc *llc) val = gpu_freq; if (snb_pcode_read(llc_to_gt(llc)->uncore, GEN6_PCODE_READ_MIN_FREQ_TABLE, &val, NULL)) { - pr_err("Failed to read freq table[%d], range [%d, %d]\n", - gpu_freq, consts.min_gpu_freq, consts.max_gpu_freq); + gt_err(llc_to_gt(llc), + "Failed to read freq table[%d], range [%d, %d]\n", + gpu_freq, consts.min_gpu_freq, + consts.max_gpu_freq); err = -ENXIO; break; } found = (val >> 0) & 0xff; if (found != ia_freq) { - pr_err("Min freq table(%d/[%d, %d]):%dMHz did not match expected CPU freq, found %d, expected %d\n", - gpu_freq, consts.min_gpu_freq, consts.max_gpu_freq, - intel_gpu_freq(rps, gpu_freq * (GRAPHICS_VER(i915) >= 9 ? GEN9_FREQ_SCALER : 1)), + gt_err(llc_to_gt(llc), + "Min freq table(%d/[%d, %d]):%dMHz did not match expected CPU freq, found %d, expected %d\n", + gpu_freq, consts.min_gpu_freq, + consts.max_gpu_freq, + intel_gpu_freq(rps, gpu_freq * scaler), found, ia_freq); err = -EINVAL; break; @@ -50,9 +55,11 @@ static int gen6_verify_ring_freq(struct intel_llc *llc) found = (val >> 8) & 0xff; if (found != ring_freq) { - pr_err("Min freq table(%d/[%d, %d]):%dMHz did not match expected ring freq, found %d, expected %d\n", - gpu_freq, consts.min_gpu_freq, consts.max_gpu_freq, - intel_gpu_freq(rps, gpu_freq * (GRAPHICS_VER(i915) >= 9 ? GEN9_FREQ_SCALER : 1)), + gt_err(llc_to_gt(llc), + "Min freq table(%d/[%d, %d]):%dMHz did not match expected ring freq, found %d, expected %d\n", + gpu_freq, consts.min_gpu_freq, + consts.max_gpu_freq, + intel_gpu_freq(rps, gpu_freq * scaler), found, ring_freq); err = -EINVAL; break; -- 2.34.1
