On ma, 2016-04-11 at 16:56 +0300, ville.syrj...@linux.intel.com wrote: > From: Ville Syrjälä <ville.syrj...@linux.intel.com> > > During runtime PM we'll be reinitializing interrupt support from the > ground up. However since the display power well will be off at that > time, well end up with a ton of unclaimed register accesses from the > display irq setup. Since we turned off the power well already before > runtime suspend, we've flagged display irqs as disabled during runtime > PM transitions. So we can just check that flag to see if we should do > skip display irqs during irq setup. > > During driver load display irqs will be flagged as enabled since we've > turned on the power well already, however the power well code will have > skipped the display irq setup since irq support as a whole wasn't yet > enabled when the power well was enabled. So we'll want to do the display > irq setup in that case. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94164 > Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
Reviewed-by: Imre Deak <imre.d...@intel.com> > --- > drivers/gpu/drm/i915/i915_irq.c | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c > b/drivers/gpu/drm/i915/i915_irq.c > index a1239fedc086..5c6511a5a74b 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -3326,7 +3326,8 @@ static void valleyview_irq_preinstall(struct > drm_device *dev) > I915_WRITE(DPINVGTT, DPINVGTT_STATUS_MASK); > > spin_lock_irq(&dev_priv->irq_lock); > - vlv_display_irq_reset(dev_priv); > + if (dev_priv->display_irqs_enabled) > + vlv_display_irq_reset(dev_priv); > spin_unlock_irq(&dev_priv->irq_lock); > } > > @@ -3403,7 +3404,8 @@ static void cherryview_irq_preinstall(struct > drm_device *dev) > I915_WRITE(DPINVGTT, DPINVGTT_STATUS_MASK_CHV); > > spin_lock_irq(&dev_priv->irq_lock); > - vlv_display_irq_reset(dev_priv); > + if (dev_priv->display_irqs_enabled) > + vlv_display_irq_reset(dev_priv); > spin_unlock_irq(&dev_priv->irq_lock); > } > > @@ -3725,7 +3727,8 @@ static int valleyview_irq_postinstall(struct > drm_device *dev) > #endif > > spin_lock_irq(&dev_priv->irq_lock); > - vlv_display_irq_postinstall(dev_priv); > + if (dev_priv->display_irqs_enabled) > + vlv_display_irq_postinstall(dev_priv); > spin_unlock_irq(&dev_priv->irq_lock); > > I915_WRITE(VLV_MASTER_IER, MASTER_INTERRUPT_ENABLE); > @@ -3831,7 +3834,8 @@ static int cherryview_irq_postinstall(struct > drm_device *dev) > gen8_gt_irq_postinstall(dev_priv); > > spin_lock_irq(&dev_priv->irq_lock); > - vlv_display_irq_postinstall(dev_priv); > + if (dev_priv->display_irqs_enabled) > + vlv_display_irq_postinstall(dev_priv); > spin_unlock_irq(&dev_priv->irq_lock); > > I915_WRITE(GEN8_MASTER_IRQ, MASTER_INTERRUPT_ENABLE); > @@ -3864,7 +3868,8 @@ static void valleyview_irq_uninstall(struct > drm_device *dev) > I915_WRITE(HWSTAM, 0xffffffff); > > spin_lock_irq(&dev_priv->irq_lock); > - vlv_display_irq_reset(dev_priv); > + if (dev_priv->display_irqs_enabled) > + vlv_display_irq_reset(dev_priv); > spin_unlock_irq(&dev_priv->irq_lock); > } > > @@ -3883,7 +3888,8 @@ static void cherryview_irq_uninstall(struct > drm_device *dev) > GEN5_IRQ_RESET(GEN8_PCU_); > > spin_lock_irq(&dev_priv->irq_lock); > - vlv_display_irq_reset(dev_priv); > + if (dev_priv->display_irqs_enabled) > + vlv_display_irq_reset(dev_priv); > spin_unlock_irq(&dev_priv->irq_lock); > } > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
