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 <[email protected]>
Cc: Daniele Ceraolo Spurio <[email protected]>
Cc: John Harrison <[email protected]>
Reviewed-by: Jonathan Cavitt <[email protected]>
Signed-off-by: John Harrison <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

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 6e8e2a287c836f35722936315f1c9e182478b077..a2812621625bf8e13df9eb05c753a6c5d12ba5e3 100644 (file)
--- 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);