| Message ID | 20220225015232.1939497-1-John.C.Harrison@Intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3] drm/i915/guc: Do not complain about stale reset notifications | expand |
On 2/24/2022 5:52 PM, John.C.Harrison@Intel.com wrote: > From: John Harrison <John.C.Harrison@Intel.com> > > It is possible for reset notifications to arrive for a context that is > in the process of being banned. So don't flag these as an error, just > report it as informational (because it is still useful to know that > resets are happening even if they are being ignored). > > v2: Better wording for the message (review feedback from Tvrtko). > v3: Fix rebase issue (review feedback from Daniele). > > Signed-off-by: John Harrison <John.C.Harrison@Intel.com> Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Daniele > --- > drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > 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 b3a429a92c0d..d39d74d39794 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > @@ -4022,10 +4022,9 @@ static void guc_handle_context_reset(struct intel_guc *guc, > capture_error_state(guc, ce); > guc_context_replay(ce); > } else { > - drm_err(&guc_to_gt(guc)->i915->drm, > - "Invalid GuC engine reset notificaion for 0x%04X on %s: banned = %d, blocked = %d", > - ce->guc_id.id, ce->engine->name, intel_context_is_banned(ce), > - context_blocked(ce)); > + drm_info(&guc_to_gt(guc)->i915->drm, > + "Ignoring context reset notification of banned context 0x%04X on %s", > + ce->guc_id.id, ce->engine->name); > } > } >
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 b3a429a92c0d..d39d74d39794 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -4022,10 +4022,9 @@ static void guc_handle_context_reset(struct intel_guc *guc, capture_error_state(guc, ce); guc_context_replay(ce); } else { - drm_err(&guc_to_gt(guc)->i915->drm, - "Invalid GuC engine reset notificaion for 0x%04X on %s: banned = %d, blocked = %d", - ce->guc_id.id, ce->engine->name, intel_context_is_banned(ce), - context_blocked(ce)); + drm_info(&guc_to_gt(guc)->i915->drm, + "Ignoring context reset notification of banned context 0x%04X on %s", + ce->guc_id.id, ce->engine->name); } }