Skip to content

Commit 9069b78

Browse files
sberbzAndi Shyti
authored andcommitted
Revert "drm/i915/gt: Log reason for setting TAINT_WARN at reset"
This reverts commit 835443d. 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> Reviewed-by: Krzysztof Karas <krzysztof.karas@intel.com> Reviewed-by: Krzysztof Niemiec <krzysztof.niemiec@intel.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/pynwwza2xyvicokflxc6lduwwrzwoihihaan54ago3m2xzzagu@qva2ue4tydie
1 parent 5bea406 commit 9069b78

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

drivers/gpu/drm/i915/gt/intel_reset.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,7 +1113,6 @@ static bool __intel_gt_unset_wedged(struct intel_gt *gt)
11131113
* Warn CI about the unrecoverable wedged condition.
11141114
* Time for a reboot.
11151115
*/
1116-
gt_err(gt, "Unrecoverable wedged condition\n");
11171116
add_taint_for_CI(gt->i915, TAINT_WARN);
11181117
return false;
11191118
}
@@ -1264,10 +1263,8 @@ void intel_gt_reset(struct intel_gt *gt,
12641263
}
12651264

12661265
ret = resume(gt);
1267-
if (ret) {
1268-
gt_err(gt, "Failed to resume (%d)\n", ret);
1266+
if (ret)
12691267
goto taint;
1270-
}
12711268

12721269
finish:
12731270
reset_finish(gt, awake);
@@ -1610,7 +1607,6 @@ void intel_gt_set_wedged_on_init(struct intel_gt *gt)
16101607
set_bit(I915_WEDGED_ON_INIT, &gt->reset.flags);
16111608

16121609
/* Wedged on init is non-recoverable */
1613-
gt_err(gt, "Non-recoverable wedged on init\n");
16141610
add_taint_for_CI(gt->i915, TAINT_WARN);
16151611
}
16161612

0 commit comments

Comments
 (0)