| Message ID | 1450189512-30360-2-git-send-email-mika.kuoppala@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Dec 15, 2015 at 04:25:07PM +0200, Mika Kuoppala wrote: > Currently interrupt code is the only place checking > for the unclaimed register access prior to actual register > macros using the same functionality. Rename the function > and make it return bool so that the possible error message > context is clear in the caller side. The motivation is to allow > usage of unclaimed detection on arbitrary places. > > v2: rebase, s/access/mmio, s/dev/dev_priv > > Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com> > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> > --- > drivers/gpu/drm/i915/i915_drv.h | 2 +- > drivers/gpu/drm/i915/i915_irq.c | 3 ++- > drivers/gpu/drm/i915/intel_uncore.c | 5 ++--- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 9124085..82c43b6 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -2731,7 +2731,7 @@ extern void intel_uncore_sanitize(struct drm_device *dev); > extern void intel_uncore_early_sanitize(struct drm_device *dev, > bool restore_forcewake); > extern void intel_uncore_init(struct drm_device *dev); > -extern void intel_uncore_check_errors(struct drm_device *dev); > +extern bool intel_uncore_unclaimed_mmio(struct drm_i915_private *dev_priv); > extern void intel_uncore_fini(struct drm_device *dev); > extern void intel_uncore_forcewake_reset(struct drm_device *dev, bool restore); > const char *intel_uncore_forcewake_domain_to_str(const enum forcewake_domain_id id); > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index 86664d1..a20dc64 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -2167,7 +2167,8 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) > > /* We get interrupts on unclaimed registers, so check for this before we > * do any I915_{READ,WRITE}. */ > - intel_uncore_check_errors(dev); > + if (intel_uncore_unclaimed_mmio(dev_priv)) > + DRM_ERROR("Unclaimed register before interrupt\n"); bdw+ too? Or do those work differently? > > /* disable master interrupt before clearing iir */ > de_ier = I915_READ(DEIER); > diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c > index 95e7803..34b60cb 100644 > --- a/drivers/gpu/drm/i915/intel_uncore.c > +++ b/drivers/gpu/drm/i915/intel_uncore.c > @@ -1606,8 +1606,7 @@ bool intel_has_gpu_reset(struct drm_device *dev) > return intel_get_gpu_reset(dev) != NULL; > } > > -void intel_uncore_check_errors(struct drm_device *dev) > +bool intel_uncore_unclaimed_mmio(struct drm_i915_private *dev_priv) > { > - if (check_for_unclaimed_mmio(to_i915(dev))) > - DRM_ERROR("Unclaimed register before interrupt\n"); > + return check_for_unclaimed_mmio(dev_priv); > } > -- > 2.5.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Ville Syrjälä <ville.syrjala@linux.intel.com> writes: > On Tue, Dec 15, 2015 at 04:25:07PM +0200, Mika Kuoppala wrote: >> Currently interrupt code is the only place checking >> for the unclaimed register access prior to actual register >> macros using the same functionality. Rename the function >> and make it return bool so that the possible error message >> context is clear in the caller side. The motivation is to allow >> usage of unclaimed detection on arbitrary places. >> >> v2: rebase, s/access/mmio, s/dev/dev_priv >> >> Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com> >> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> >> --- >> drivers/gpu/drm/i915/i915_drv.h | 2 +- >> drivers/gpu/drm/i915/i915_irq.c | 3 ++- >> drivers/gpu/drm/i915/intel_uncore.c | 5 ++--- >> 3 files changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h >> index 9124085..82c43b6 100644 >> --- a/drivers/gpu/drm/i915/i915_drv.h >> +++ b/drivers/gpu/drm/i915/i915_drv.h >> @@ -2731,7 +2731,7 @@ extern void intel_uncore_sanitize(struct drm_device *dev); >> extern void intel_uncore_early_sanitize(struct drm_device *dev, >> bool restore_forcewake); >> extern void intel_uncore_init(struct drm_device *dev); >> -extern void intel_uncore_check_errors(struct drm_device *dev); >> +extern bool intel_uncore_unclaimed_mmio(struct drm_i915_private *dev_priv); >> extern void intel_uncore_fini(struct drm_device *dev); >> extern void intel_uncore_forcewake_reset(struct drm_device *dev, bool restore); >> const char *intel_uncore_forcewake_domain_to_str(const enum forcewake_domain_id id); >> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c >> index 86664d1..a20dc64 100644 >> --- a/drivers/gpu/drm/i915/i915_irq.c >> +++ b/drivers/gpu/drm/i915/i915_irq.c >> @@ -2167,7 +2167,8 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) >> >> /* We get interrupts on unclaimed registers, so check for this before we >> * do any I915_{READ,WRITE}. */ >> - intel_uncore_check_errors(dev); >> + if (intel_uncore_unclaimed_mmio(dev_priv)) >> + DRM_ERROR("Unclaimed register before interrupt\n"); > > bdw+ too? Or do those work differently? bdw too yes. But we throw the irq arming out in 4/7 completely. -Mika > >> >> /* disable master interrupt before clearing iir */ >> de_ier = I915_READ(DEIER); >> diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c >> index 95e7803..34b60cb 100644 >> --- a/drivers/gpu/drm/i915/intel_uncore.c >> +++ b/drivers/gpu/drm/i915/intel_uncore.c >> @@ -1606,8 +1606,7 @@ bool intel_has_gpu_reset(struct drm_device *dev) >> return intel_get_gpu_reset(dev) != NULL; >> } >> >> -void intel_uncore_check_errors(struct drm_device *dev) >> +bool intel_uncore_unclaimed_mmio(struct drm_i915_private *dev_priv) >> { >> - if (check_for_unclaimed_mmio(to_i915(dev))) >> - DRM_ERROR("Unclaimed register before interrupt\n"); >> + return check_for_unclaimed_mmio(dev_priv); >> } >> -- >> 2.5.0 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Ville Syrjälä > Intel OTC
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 9124085..82c43b6 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2731,7 +2731,7 @@ extern void intel_uncore_sanitize(struct drm_device *dev); extern void intel_uncore_early_sanitize(struct drm_device *dev, bool restore_forcewake); extern void intel_uncore_init(struct drm_device *dev); -extern void intel_uncore_check_errors(struct drm_device *dev); +extern bool intel_uncore_unclaimed_mmio(struct drm_i915_private *dev_priv); extern void intel_uncore_fini(struct drm_device *dev); extern void intel_uncore_forcewake_reset(struct drm_device *dev, bool restore); const char *intel_uncore_forcewake_domain_to_str(const enum forcewake_domain_id id); diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 86664d1..a20dc64 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -2167,7 +2167,8 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) /* We get interrupts on unclaimed registers, so check for this before we * do any I915_{READ,WRITE}. */ - intel_uncore_check_errors(dev); + if (intel_uncore_unclaimed_mmio(dev_priv)) + DRM_ERROR("Unclaimed register before interrupt\n"); /* disable master interrupt before clearing iir */ de_ier = I915_READ(DEIER); diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index 95e7803..34b60cb 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -1606,8 +1606,7 @@ bool intel_has_gpu_reset(struct drm_device *dev) return intel_get_gpu_reset(dev) != NULL; } -void intel_uncore_check_errors(struct drm_device *dev) +bool intel_uncore_unclaimed_mmio(struct drm_i915_private *dev_priv) { - if (check_for_unclaimed_mmio(to_i915(dev))) - DRM_ERROR("Unclaimed register before interrupt\n"); + return check_for_unclaimed_mmio(dev_priv); }