drm/i915/guc: Suppress 'ignoring reset notification' message

If an active context has been banned (e.g. Ctrl+C killed) then it is
likely to be reset as part of evicting it from the hardware. That
results in a 'ignoring context reset notification: banned = 1'
message at info level. This confuses/concerns people and makes them
think something has gone wrong when it hasn't.

There is already a debug level message with essentially the same
information. So drop the 'ignore' info level one and just add the
'ignore' flag to the debug level one instead (which will therefore not
appear by default but will still show up in CI runs).

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230921182033.135448-1-John.C.Harrison@Intel.com

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
index ae3495a9c8146754079922d433fe48ca054d3d94..2cce5ec1ff00d6aa8910526ce20a8e513efbd257 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
@@ -4802,19 +4802,19 @@ static void guc_context_replay(struct intel_context *ce)
 static void guc_handle_context_reset(struct intel_guc *guc,
                                     struct intel_context *ce)
 {
+       bool capture = intel_context_is_schedulable(ce);
+
        trace_intel_context_reset(ce);
 
-       guc_dbg(guc, "Got context reset notification: 0x%04X on %s, exiting = %s, banned = %s\n",
+       guc_dbg(guc, "%s context reset notification: 0x%04X on %s, exiting = %s, banned = %s\n",
+               capture ? "Got" : "Ignoring",
                ce->guc_id.id, ce->engine->name,
                str_yes_no(intel_context_is_exiting(ce)),
                str_yes_no(intel_context_is_banned(ce)));
 
-       if (likely(intel_context_is_schedulable(ce))) {
+       if (capture) {
                capture_error_state(guc, ce);
                guc_context_replay(ce);
-       } else {
-               guc_info(guc, "Ignoring context reset notification of exiting context 0x%04X on %s",
-                        ce->guc_id.id, ce->engine->name);
        }
 }