| Message ID | 20230510205556.312999-1-John.C.Harrison@Intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i1915/guc: Fix probe injection CI failures after recent change | expand |
Hi John, On Wed, May 10, 2023 at 01:55:56PM -0700, John.C.Harrison@Intel.com wrote: > From: John Harrison <John.C.Harrison@Intel.com> > > A recent change bumped a 'notice' message up to 'error' level for > debug builds to help trap incorrect configurations in CI systems. > Unfortunaetly, tha error condition in question is triggered by the /tha/the/ > error injection probe test. So change the message again to be 'probe > error' level instead. > > Signed-off-by: John Harrison <John.C.Harrison@Intel.com> > Fixes: 760133d42f0a ("drm/i915/uc: Make unexpected firmware versions an error in debug builds") > Cc: John Harrison <John.C.Harrison@Intel.com> > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Cc: Alan Previn <alan.previn.teres.alexis@intel.com> > Cc: Lucas De Marchi <lucas.demarchi@intel.com> > Cc: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Andi > --- > drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c > index 4ec7df9ed5ff3..e467d9af61876 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c > @@ -18,7 +18,7 @@ > #include "i915_reg.h" > > #if IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM) > -#define UNEXPECTED gt_err > +#define UNEXPECTED gt_probe_error > #else > #define UNEXPECTED gt_notice > #endif > -- > 2.39.1
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c index 4ec7df9ed5ff3..e467d9af61876 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c @@ -18,7 +18,7 @@ #include "i915_reg.h" #if IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM) -#define UNEXPECTED gt_err +#define UNEXPECTED gt_probe_error #else #define UNEXPECTED gt_notice #endif