| Message ID | 1350065645-3766-1-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi 2012/10/12 Daniel Vetter <daniel.vetter@ffwll.ch>: > Somehow this was left out in the refactoring that introduced the pch > handlers. Avoids a hotplug_mask special case in the ilk_irq_handler. > > Noticed while hunting down the pch hotplug bits. > > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> > --- > drivers/gpu/drm/i915/i915_irq.c | 16 ++++++---------- > 1 file changed, 6 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index 59f3058..14d74c0 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -606,6 +606,9 @@ static void ibx_irq_handler(struct drm_device *dev, u32 pch_iir) > drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; > int pipe; > > + if (pch_iir & SDE_HOTPLUG_MASK) > + queue_work(dev_priv->wq, &dev_priv->hotplug_work); > + > if (pch_iir & SDE_AUDIO_POWER_MASK) > DRM_DEBUG_DRIVER("PCH audio power change on port %d\n", > (pch_iir & SDE_AUDIO_POWER_MASK) >> > @@ -646,6 +649,9 @@ static void cpt_irq_handler(struct drm_device *dev, u32 pch_iir) > drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; > int pipe; > > + if (pch_iir & SDE_HOTPLUG_MASK_CPT) > + queue_work(dev_priv->wq, &dev_priv->hotplug_work); > + > if (pch_iir & SDE_AUDIO_POWER_MASK_CPT) > DRM_DEBUG_DRIVER("PCH audio power change on port %d\n", > (pch_iir & SDE_AUDIO_POWER_MASK_CPT) >> > @@ -709,8 +715,6 @@ static irqreturn_t ivybridge_irq_handler(int irq, void *arg) > if (de_iir & DE_PCH_EVENT_IVB) { > u32 pch_iir = I915_READ(SDEIIR); > > - if (pch_iir & SDE_HOTPLUG_MASK_CPT) > - queue_work(dev_priv->wq, &dev_priv->hotplug_work); > cpt_irq_handler(dev, pch_iir); > > /* clear PCH hotplug event before clear CPU irq */ > @@ -751,7 +755,6 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) > drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; > int ret = IRQ_NONE; > u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir; > - u32 hotplug_mask; > > atomic_inc(&dev_priv->irq_received); > > @@ -769,11 +772,6 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) > (!IS_GEN6(dev) || pm_iir == 0)) > goto done; > > - if (HAS_PCH_CPT(dev)) > - hotplug_mask = SDE_HOTPLUG_MASK_CPT; > - else > - hotplug_mask = SDE_HOTPLUG_MASK; > - > ret = IRQ_HANDLED; > > if (IS_GEN5(dev)) > @@ -802,8 +800,6 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) > > /* check event from PCH */ > if (de_iir & DE_PCH_EVENT) { > - if (pch_iir & hotplug_mask) > - queue_work(dev_priv->wq, &dev_priv->hotplug_work); > if (HAS_PCH_CPT(dev)) > cpt_irq_handler(dev, pch_iir); > else > -- > 1.7.10.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Wed, Oct 17, 2012 at 03:58:21PM -0300, Paulo Zanoni wrote: > Hi > > 2012/10/12 Daniel Vetter <daniel.vetter@ffwll.ch>: > > Somehow this was left out in the refactoring that introduced the pch > > handlers. Avoids a hotplug_mask special case in the ilk_irq_handler. > > > > Noticed while hunting down the pch hotplug bits. > > > > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Thanks for the review, merged to dinq. -Daniel
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 59f3058..14d74c0 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -606,6 +606,9 @@ static void ibx_irq_handler(struct drm_device *dev, u32 pch_iir) drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; int pipe; + if (pch_iir & SDE_HOTPLUG_MASK) + queue_work(dev_priv->wq, &dev_priv->hotplug_work); + if (pch_iir & SDE_AUDIO_POWER_MASK) DRM_DEBUG_DRIVER("PCH audio power change on port %d\n", (pch_iir & SDE_AUDIO_POWER_MASK) >> @@ -646,6 +649,9 @@ static void cpt_irq_handler(struct drm_device *dev, u32 pch_iir) drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; int pipe; + if (pch_iir & SDE_HOTPLUG_MASK_CPT) + queue_work(dev_priv->wq, &dev_priv->hotplug_work); + if (pch_iir & SDE_AUDIO_POWER_MASK_CPT) DRM_DEBUG_DRIVER("PCH audio power change on port %d\n", (pch_iir & SDE_AUDIO_POWER_MASK_CPT) >> @@ -709,8 +715,6 @@ static irqreturn_t ivybridge_irq_handler(int irq, void *arg) if (de_iir & DE_PCH_EVENT_IVB) { u32 pch_iir = I915_READ(SDEIIR); - if (pch_iir & SDE_HOTPLUG_MASK_CPT) - queue_work(dev_priv->wq, &dev_priv->hotplug_work); cpt_irq_handler(dev, pch_iir); /* clear PCH hotplug event before clear CPU irq */ @@ -751,7 +755,6 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; int ret = IRQ_NONE; u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir; - u32 hotplug_mask; atomic_inc(&dev_priv->irq_received); @@ -769,11 +772,6 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) (!IS_GEN6(dev) || pm_iir == 0)) goto done; - if (HAS_PCH_CPT(dev)) - hotplug_mask = SDE_HOTPLUG_MASK_CPT; - else - hotplug_mask = SDE_HOTPLUG_MASK; - ret = IRQ_HANDLED; if (IS_GEN5(dev)) @@ -802,8 +800,6 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) /* check event from PCH */ if (de_iir & DE_PCH_EVENT) { - if (pch_iir & hotplug_mask) - queue_work(dev_priv->wq, &dev_priv->hotplug_work); if (HAS_PCH_CPT(dev)) cpt_irq_handler(dev, pch_iir); else
Somehow this was left out in the refactoring that introduced the pch handlers. Avoids a hotplug_mask special case in the ilk_irq_handler. Noticed while hunting down the pch hotplug bits. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/i915/i915_irq.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)