]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/i915/guc: Change GEM_WARN_ON to guc_err to prevent taints in CI
authorJesus Narvaez <jesus.narvaez@intel.com>
Thu, 8 Aug 2024 20:49:43 +0000 (13:49 -0700)
committerJohn Harrison <John.C.Harrison@Intel.com>
Fri, 16 Aug 2024 18:04:53 +0000 (11:04 -0700)
This warning was supposed to catch a harmless issue, but changing to
guc_error should prevent kernel taints in CI runs.

Signed-off-by: Jesus Narvaez <jesus.narvaez@intel.com>
Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240808204943.911727-1-jesus.narvaez@intel.com
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c

index 9400d0eb682b234825c2320d99c9d6a7515fa10b..c3a5d9e1288e81eeea486712a95289d20e5b441d 100644 (file)
@@ -2014,11 +2014,12 @@ void intel_guc_submission_reset_finish(struct intel_guc *guc)
 
        /*
         * Technically possible for either of these values to be non-zero here,
-        * but very unlikely + harmless. Regardless let's add a warn so we can
+        * but very unlikely + harmless. Regardless let's add an error so we can
         * see in CI if this happens frequently / a precursor to taking down the
         * machine.
         */
-       GEM_WARN_ON(atomic_read(&guc->outstanding_submission_g2h));
+       if (atomic_read(&guc->outstanding_submission_g2h))
+               guc_err(guc, "Unexpected outstanding GuC to Host in reset finish\n");
        atomic_set(&guc->outstanding_submission_g2h, 0);
 
        intel_guc_global_policies_update(guc);