From: Jesus Narvaez Date: Fri, 13 Dec 2024 20:47:20 +0000 (-0800) Subject: drm/i915/guc: Update guc_err message to show outstanding g2h responses X-Git-Tag: v6.14-rc1~174^2~16^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f373ebec18a75d671908e81ed9925aebf279ec2f;p=thirdparty%2Fkernel%2Flinux.git 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 Cc: Daniele Ceraolo Spurio Cc: John Harrison Reviewed-by: Jonathan Cavitt Signed-off-by: John Harrison Link: https://patchwork.freedesktop.org/patch/msgid/20241213204720.3918056-1-jesus.narvaez@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 6e8e2a287c836..a2812621625bf 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -2046,6 +2046,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) || @@ -2059,8 +2061,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);