| Message ID | 20211223013128.1739792-1-John.C.Harrison@Intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/guc: Report error on invalid reset notification | expand |
On Wed, Dec 22, 2021 at 05:31:28PM -0800, John.C.Harrison@Intel.com wrote: > From: John Harrison <John.C.Harrison@Intel.com> > > Don't silently drop reset notifications from the GuC. It might not be > safe to do an error capture but we still want some kind of report that > the reset happened. > > Signed-off-by: John Harrison <John.C.Harrison@Intel.com> > --- > drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 5 +++++ > 1 file changed, 5 insertions(+) > > 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 e7517206af82..0fbf24b8d5e1 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > @@ -3979,6 +3979,11 @@ static void guc_handle_context_reset(struct intel_guc *guc, > !context_blocked(ce))) { > 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)); As discussed off the list, I'll a take an AR to see if we can not supress the capture here. But until that gets resolved: Reviewed-by: Matthew Brost <matthew.brost@intel.com> > } > } > > -- > 2.25.1 >
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 e7517206af82..0fbf24b8d5e1 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -3979,6 +3979,11 @@ static void guc_handle_context_reset(struct intel_guc *guc, !context_blocked(ce))) { 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)); } }