Paulo Zanoni <przan...@gmail.com> writes:
> From: Paulo Zanoni <paulo.r.zan...@intel.com>
>
> The ironlake_irq_handler and ivybridge_irq_handler functions do
> basically the same thing, but they have different implementation
> styles. With this patch we reorganize ironlake_irq_handler in a way
> that makes it look very similar to ivybridge_irq_handler.
>
> One of the advantages of this new function style is that we don't
> write 0 to the IIR registers anymore.
>
> v2: - Rebase due to changes on previous patches
> - Move pm_iir to a tighter scope (Chris)
>
> Signed-off-by: Paulo Zanoni <paulo.r.zan...@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuopp...@intel.com>
> ---
> drivers/gpu/drm/i915/i915_irq.c | 46
> ++++++++++++++++++++---------------------
> 1 file changed, 23 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index c674dc3..88eb380 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -1389,7 +1389,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void
> *arg)
> struct drm_device *dev = (struct drm_device *) 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, pm_iir = 0, sde_ier;
> + u32 de_iir, gt_iir, de_ier, sde_ier;
>
> atomic_inc(&dev_priv->irq_received);
>
> @@ -1407,33 +1407,33 @@ static irqreturn_t ironlake_irq_handler(int irq, void
> *arg)
> I915_WRITE(SDEIER, 0);
> POSTING_READ(SDEIER);
>
> - de_iir = I915_READ(DEIIR);
> gt_iir = I915_READ(GTIIR);
> - if (IS_GEN6(dev))
> - pm_iir = I915_READ(GEN6_PMIIR);
> -
> - if (de_iir == 0 && gt_iir == 0 && pm_iir == 0)
> - goto done;
> -
> - ret = IRQ_HANDLED;
> -
> - if (IS_GEN5(dev))
> - ilk_gt_irq_handler(dev, dev_priv, gt_iir);
> - else
> - snb_gt_irq_handler(dev, dev_priv, gt_iir);
> + if (gt_iir) {
> + if (IS_GEN5(dev))
> + ilk_gt_irq_handler(dev, dev_priv, gt_iir);
> + else
> + snb_gt_irq_handler(dev, dev_priv, gt_iir);
> + I915_WRITE(GTIIR, gt_iir);
> + ret = IRQ_HANDLED;
> + }
>
> - if (de_iir)
> + de_iir = I915_READ(DEIIR);
> + if (de_iir) {
> ilk_display_irq_handler(dev, de_iir);
> + I915_WRITE(DEIIR, de_iir);
> + ret = IRQ_HANDLED;
> + }
>
> - if (pm_iir & GEN6_PM_RPS_EVENTS)
> - gen6_rps_irq_handler(dev_priv, pm_iir);
> -
> - I915_WRITE(GTIIR, gt_iir);
> - I915_WRITE(DEIIR, de_iir);
> - if (pm_iir)
> - I915_WRITE(GEN6_PMIIR, pm_iir);
> + if (IS_GEN6(dev)) {
> + u32 pm_iir = I915_READ(GEN6_PMIIR);
> + if (pm_iir) {
> + if (pm_iir & GEN6_PM_RPS_EVENTS)
> + gen6_rps_irq_handler(dev_priv, pm_iir);
> + I915_WRITE(GEN6_PMIIR, pm_iir);
> + ret = IRQ_HANDLED;
> + }
> + }
>
> -done:
> I915_WRITE(DEIER, de_ier);
> POSTING_READ(DEIER);
> I915_WRITE(SDEIER, sde_ier);
> --
> 1.8.1.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
