| Message ID | 20220408164837.3845786-1-lucas.demarchi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/uncore: Warn only if unclaimed access remains flagged | expand |
On Fri, Apr 08, 2022 at 09:48:37AM -0700, Lucas De Marchi wrote: > Commit 4b276ed3c7ac ("drm/i915/uncore: Warn on previous unclaimed > accesses") tried to improve our report of unclaimed register access, > however it unveiled cases that were not previously causing any harm. > > Downgrade the first message to debug so we can still see them and > eventually fix, but don't warn. > > Fixes: 4b276ed3c7ac ("drm/i915/uncore: Warn on previous unclaimed accesses") > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> > --- > > Tested on top of intel/CI_DRM_11471 as drm-tip is currently broken by > other things. > > drivers/gpu/drm/i915/intel_uncore.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c > index df59ec88459e..83517a703eb6 100644 > --- a/drivers/gpu/drm/i915/intel_uncore.c > +++ b/drivers/gpu/drm/i915/intel_uncore.c > @@ -1518,13 +1518,11 @@ __unclaimed_previous_reg_debug(struct intel_uncore *uncore, > const i915_reg_t reg, > const bool read) > { > - if (drm_WARN(&uncore->i915->drm, > - check_for_unclaimed_mmio(uncore), > - "Unclaimed access detected before %s register 0x%x\n", > - read ? "read from" : "write to", > - i915_mmio_reg_offset(reg))) > - /* Only report the first N failures */ > - uncore->i915->params.mmio_debug--; > + if (check_for_unclaimed_mmio(uncore)) > + drm_dbg(&uncore->i915->drm, > + "Unclaimed access detected before %s register 0x%x\n", > + read ? "read from" : "write to", > + i915_mmio_reg_offset(reg)); > } > > static inline void > -- > 2.35.1 >
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index df59ec88459e..83517a703eb6 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -1518,13 +1518,11 @@ __unclaimed_previous_reg_debug(struct intel_uncore *uncore, const i915_reg_t reg, const bool read) { - if (drm_WARN(&uncore->i915->drm, - check_for_unclaimed_mmio(uncore), - "Unclaimed access detected before %s register 0x%x\n", - read ? "read from" : "write to", - i915_mmio_reg_offset(reg))) - /* Only report the first N failures */ - uncore->i915->params.mmio_debug--; + if (check_for_unclaimed_mmio(uncore)) + drm_dbg(&uncore->i915->drm, + "Unclaimed access detected before %s register 0x%x\n", + read ? "read from" : "write to", + i915_mmio_reg_offset(reg)); } static inline void
Commit 4b276ed3c7ac ("drm/i915/uncore: Warn on previous unclaimed accesses") tried to improve our report of unclaimed register access, however it unveiled cases that were not previously causing any harm. Downgrade the first message to debug so we can still see them and eventually fix, but don't warn. Fixes: 4b276ed3c7ac ("drm/i915/uncore: Warn on previous unclaimed accesses") Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> --- Tested on top of intel/CI_DRM_11471 as drm-tip is currently broken by other things. drivers/gpu/drm/i915/intel_uncore.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)