| Message ID | 20241213204720.3918056-1-jesus.narvaez@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | drm/i915/guc: Update guc_err message to show outstanding g2h responses | expand |
-----Original Message----- From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Jesus Narvaez Sent: Friday, December 13, 2024 12:47 PM To: intel-gfx@lists.freedesktop.org Cc: Narvaez, Jesus <jesus.narvaez@intel.com>; Ceraolo Spurio, Daniele <daniele.ceraolospurio@intel.com>; Harrison, John C <john.c.harrison@intel.com> Subject: [PATCH] drm/i915/guc: Update guc_err message to show outstanding g2h responses > > Updating the guc_error message to show how many g2h responses > are still outstanding, in order to help with future debugging. > > Signed-off-by: Jesus Narvaez <jesus.narvaez@intel.com> > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > Cc: John Harrison <John.C.Harrison@Intel.com> I can't think of any compelling reason to block this, so Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com> -Jonathan Cavitt > --- > drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 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 353a9167c9a4..d49d645aa86d 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > @@ -2009,6 +2009,8 @@ void intel_guc_submission_cancel_requests(struct intel_guc *guc) > > void intel_guc_submission_reset_finish(struct intel_guc *guc) > { > + int outstanding; > + > /* Reset called during driver load or during wedge? */ > if (unlikely(!guc_submission_initialized(guc) || > !intel_guc_is_fw_running(guc) || > @@ -2022,8 +2024,10 @@ void intel_guc_submission_reset_finish(struct intel_guc *guc) > * see in CI if this happens frequently / a precursor to taking down the > * machine. > */ > - if (atomic_read(&guc->outstanding_submission_g2h)) > - guc_err(guc, "Unexpected outstanding GuC to Host in reset finish\n"); > + outstanding = atomic_read(&guc->outstanding_submission_g2h); > + if (outstanding) > + guc_err(guc, "Unexpected outstanding GuC to Host response(s) in reset finish: %d\n", > + outstanding); > atomic_set(&guc->outstanding_submission_g2h, 0); > > intel_guc_global_policies_update(guc); > -- > 2.34.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 353a9167c9a4..d49d645aa86d 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -2009,6 +2009,8 @@ void intel_guc_submission_cancel_requests(struct intel_guc *guc) void intel_guc_submission_reset_finish(struct intel_guc *guc) { + int outstanding; + /* Reset called during driver load or during wedge? */ if (unlikely(!guc_submission_initialized(guc) || !intel_guc_is_fw_running(guc) || @@ -2022,8 +2024,10 @@ void intel_guc_submission_reset_finish(struct intel_guc *guc) * see in CI if this happens frequently / a precursor to taking down the * machine. */ - if (atomic_read(&guc->outstanding_submission_g2h)) - guc_err(guc, "Unexpected outstanding GuC to Host in reset finish\n"); + outstanding = atomic_read(&guc->outstanding_submission_g2h); + if (outstanding) + guc_err(guc, "Unexpected outstanding GuC to Host response(s) in reset finish: %d\n", + outstanding); atomic_set(&guc->outstanding_submission_g2h, 0); intel_guc_global_policies_update(guc);
Updating the guc_error message to show how many g2h responses are still outstanding, in order to help with future debugging. Signed-off-by: Jesus Narvaez <jesus.narvaez@intel.com> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Cc: John Harrison <John.C.Harrison@Intel.com> --- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)