From: Jesus Narvaez Date: Thu, 8 Aug 2024 20:49:43 +0000 (-0700) Subject: drm/i915/guc: Change GEM_WARN_ON to guc_err to prevent taints in CI X-Git-Tag: v6.12-rc1~126^2~19^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=437ad4534a15ccf538ddb440cb29d3f445251605;p=thirdparty%2Fkernel%2Flinux.git drm/i915/guc: Change GEM_WARN_ON to guc_err to prevent taints in CI 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 Reviewed-by: Jonathan Cavitt Signed-off-by: John Harrison Link: https://patchwork.freedesktop.org/patch/msgid/20240808204943.911727-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 9400d0eb682b2..c3a5d9e1288e8 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -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);