| Message ID | vfj2igeeokgsmcekh2qxys2y7c7dqplb6rhsybmjqn3ykxlcrf@yjnuqmgrze3z (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v3] Revert "drm/i915/gt: Log reason for setting TAINT_WARN at reset" | expand |
Hi Sebastian, On Thu, Jan 30, 2025 at 11:35:08AM +0000, Sebastian Brzezinka wrote: > This reverts commit 835443da6f50d9516b58bba5a4fdf9e563d961c7. > > Logging with gt_err() causes CI to detect an error even in cases of > intentional error injection. Since real errors are already correctly > reported by CI, this additional message is unnecessary. > > Furthermore, a GT wedge is already being logged elsewhere, so instead > of adjusting the log level, revert the above mentioned commit to prevent > redundant error reporting yeah, we missed the fact that this extra logs have upset CI. > Signed-off-by: Sebastian Brzezinka <sebastian.brzezinka@intel.com> merged to drm-intel-gt-next. Thanks, Andi
diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c index 5a625518d1a9..33b55c581552 100644 --- a/drivers/gpu/drm/i915/gt/intel_reset.c +++ b/drivers/gpu/drm/i915/gt/intel_reset.c @@ -1113,7 +1113,6 @@ static bool __intel_gt_unset_wedged(struct intel_gt *gt) * Warn CI about the unrecoverable wedged condition. * Time for a reboot. */ - gt_err(gt, "Unrecoverable wedged condition\n"); add_taint_for_CI(gt->i915, TAINT_WARN); return false; } @@ -1265,10 +1264,8 @@ void intel_gt_reset(struct intel_gt *gt, } ret = resume(gt); - if (ret) { - gt_err(gt, "Failed to resume (%d)\n", ret); + if (ret) goto taint; - } finish: reset_finish(gt, awake); @@ -1611,7 +1608,6 @@ void intel_gt_set_wedged_on_init(struct intel_gt *gt) set_bit(I915_WEDGED_ON_INIT, >->reset.flags); /* Wedged on init is non-recoverable */ - gt_err(gt, "Non-recoverable wedged on init\n"); add_taint_for_CI(gt->i915, TAINT_WARN); }
This reverts commit 835443da6f50d9516b58bba5a4fdf9e563d961c7. Logging with gt_err() causes CI to detect an error even in cases of intentional error injection. Since real errors are already correctly reported by CI, this additional message is unnecessary. Furthermore, a GT wedge is already being logged elsewhere, so instead of adjusting the log level, revert the above mentioned commit to prevent redundant error reporting Signed-off-by: Sebastian Brzezinka <sebastian.brzezinka@intel.com> --- v2 -> v3: - rephrase commit message again --- drivers/gpu/drm/i915/gt/intel_reset.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)