On Mon, Mar 24, 2014 at 09:26:52PM +0200, Ville Syrjälä wrote:
> On Sat, Mar 15, 2014 at 08:23:22PM +0530, deepak.s@xxxxxxxxxxxxxxx wrote:
> > From: Deepak S <deepak.s@xxxxxxxxxxxxxxx>
> >
> > When we use different rps events for different platform or due to wa, we
> > mgiht end up doing (vs) everywahere. Insted of this, Let's use a variable
> > in dev_priv to track the enabled PM interrupts
I didn't follow this really, so I've reworded it a bit and fixed the
spelling - or tried to at least ;-)
> >
> > v2: Initialize pm_rps_events in intel_irq_init() (Ville).
> >
> > Signed-off-by: Deepak S <deepak.s@xxxxxxxxxxxxxxx>
>
> Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Queued for -next, thanks for the patch.
-Daniel
>
> > ---
> > drivers/gpu/drm/i915/i915_drv.h | 1 +
> > drivers/gpu/drm/i915/i915_irq.c | 17 ++++++++++-------
> > drivers/gpu/drm/i915/intel_pm.c | 11 ++++++-----
> > 3 files changed, 17 insertions(+), 12 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> > index 70fbe90..d522313 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -1487,6 +1487,7 @@ typedef struct drm_i915_private {
> > };
> > u32 gt_irq_mask;
> > u32 pm_irq_mask;
> > + u32 pm_rps_events;
> > u32 pipestat_irq_mask[I915_MAX_PIPES];
> >
> > struct work_struct hotplug_work;
> > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> > index 37f852d..00b3bfc 100644
> > --- a/drivers/gpu/drm/i915/i915_irq.c
> > +++ b/drivers/gpu/drm/i915/i915_irq.c
> > @@ -1132,13 +1132,13 @@ static void gen6_pm_rps_work(struct work_struct *work)
> > pm_iir = dev_priv->rps.pm_iir;
> > dev_priv->rps.pm_iir = 0;
> > /* Make sure not to corrupt PMIMR state used by ringbuffer code */
> > - snb_enable_pm_irq(dev_priv, GEN6_PM_RPS_EVENTS);
> > + snb_enable_pm_irq(dev_priv, dev_priv->pm_rps_events);
> > spin_unlock_irq(&dev_priv->irq_lock);
> >
> > /* Make sure we didn't queue anything we're not going to process. */
> > - WARN_ON(pm_iir & ~GEN6_PM_RPS_EVENTS);
> > + WARN_ON(pm_iir & ~dev_priv->pm_rps_events);
> >
> > - if ((pm_iir & GEN6_PM_RPS_EVENTS) == 0)
> > + if ((pm_iir & dev_priv->pm_rps_events) == 0)
> > return;
> >
> > mutex_lock(&dev_priv->rps.hw_lock);
> > @@ -1555,10 +1555,10 @@ static void i9xx_pipe_crc_irq_handler(struct drm_device *dev, enum pipe pipe)
> > * the work queue. */
> > static void gen6_rps_irq_handler(struct drm_i915_private *dev_priv, u32 pm_iir)
> > {
> > - if (pm_iir & GEN6_PM_RPS_EVENTS) {
> > + if (pm_iir & dev_priv->pm_rps_events) {
> > spin_lock(&dev_priv->irq_lock);
> > - dev_priv->rps.pm_iir |= pm_iir & GEN6_PM_RPS_EVENTS;
> > - snb_disable_pm_irq(dev_priv, pm_iir & GEN6_PM_RPS_EVENTS);
> > + dev_priv->rps.pm_iir |= pm_iir & dev_priv->pm_rps_events;
> > + snb_disable_pm_irq(dev_priv, pm_iir & dev_priv->pm_rps_events);
> > spin_unlock(&dev_priv->irq_lock);
> >
> > queue_work(dev_priv->wq, &dev_priv->rps.work);
> > @@ -2983,7 +2983,7 @@ static void gen5_gt_irq_postinstall(struct drm_device *dev)
> > POSTING_READ(GTIER);
> >
> > if (INTEL_INFO(dev)->gen >= 6) {
> > - pm_irqs |= GEN6_PM_RPS_EVENTS;
> > + pm_irqs |= dev_priv->pm_rps_events;
> >
> > if (HAS_VEBOX(dev))
> > pm_irqs |= PM_VEBOX_USER_INTERRUPT;
> > @@ -4030,6 +4030,9 @@ void intel_irq_init(struct drm_device *dev)
> > INIT_WORK(&dev_priv->rps.work, gen6_pm_rps_work);
> > INIT_WORK(&dev_priv->l3_parity.error_work, ivybridge_parity_work);
> >
> > + /* Let's track the enabled rps events */
> > + dev_priv->pm_rps_events = GEN6_PM_RPS_EVENTS;
> > +
> > setup_timer(&dev_priv->gpu_error.hangcheck_timer,
> > i915_hangcheck_elapsed,
> > (unsigned long) dev);
> > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> > index ad58ce3..95b133a 100644
> > --- a/drivers/gpu/drm/i915/intel_pm.c
> > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > @@ -3160,7 +3160,8 @@ static void gen6_disable_rps_interrupts(struct drm_device *dev)
> > struct drm_i915_private *dev_priv = dev->dev_private;
> >
> > I915_WRITE(GEN6_PMINTRMSK, 0xffffffff);
> > - I915_WRITE(GEN6_PMIER, I915_READ(GEN6_PMIER) & ~GEN6_PM_RPS_EVENTS);
> > + I915_WRITE(GEN6_PMIER, I915_READ(GEN6_PMIER) &
> > + ~dev_priv->pm_rps_events);
> > /* Complete PM interrupt masking here doesn't race with the rps work
> > * item again unmasking PM interrupts because that is using a different
> > * register (PMIMR) to mask PM interrupts. The only risk is in leaving
> > @@ -3170,7 +3171,7 @@ static void gen6_disable_rps_interrupts(struct drm_device *dev)
> > dev_priv->rps.pm_iir = 0;
> > spin_unlock_irq(&dev_priv->irq_lock);
> >
> > - I915_WRITE(GEN6_PMIIR, GEN6_PM_RPS_EVENTS);
> > + I915_WRITE(GEN6_PMIIR, dev_priv->pm_rps_events);
> > }
> >
> > static void gen6_disable_rps(struct drm_device *dev)
> > @@ -3232,12 +3233,12 @@ static void gen6_enable_rps_interrupts(struct drm_device *dev)
> >
> > spin_lock_irq(&dev_priv->irq_lock);
> > WARN_ON(dev_priv->rps.pm_iir);
> > - snb_enable_pm_irq(dev_priv, GEN6_PM_RPS_EVENTS);
> > - I915_WRITE(GEN6_PMIIR, GEN6_PM_RPS_EVENTS);
> > + snb_enable_pm_irq(dev_priv, dev_priv->pm_rps_events);
> > + I915_WRITE(GEN6_PMIIR, dev_priv->pm_rps_events);
> > spin_unlock_irq(&dev_priv->irq_lock);
> >
> > /* only unmask PM interrupts we need. Mask all others. */
> > - enabled_intrs = GEN6_PM_RPS_EVENTS;
> > + enabled_intrs = dev_priv->pm_rps_events;
> >
> > /* IVB and SNB hard hangs on looping batchbuffer
> > * if GEN6_PM_UP_EI_EXPIRED is masked.
> > --
> > 1.8.4.2
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Ville Syrjälä
> Intel OTC
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
