[Intel-gfx] [PATCH 06/14] drm/i915: Use GEN5_IRQ_RESET() on vlv/chv

[Paulo Zanoni]

2014-10-30 15:42 GMT-02:00  <ville.syrjala at linux.intel.com>:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> Replace the hand rolled IIR,IER,IMR disable sequences with
> GEN5_IRQ_RESET().

Reviewed-by: Paulo Zanoni <paulo.r.zanoni at intel.com>

>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/i915_irq.c | 25 +++++--------------------
>  1 file changed, 5 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 589ae51..c106bba 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -3128,11 +3128,8 @@ static void valleyview_irq_preinstall(struct drm_device *dev)
>         I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
>         for_each_pipe(dev_priv, pipe)
>                 I915_WRITE(PIPESTAT(pipe), 0xffff);
> -       I915_WRITE(VLV_IMR, 0xffffffff);
> -       I915_WRITE(VLV_IER, 0x0);
> -       I915_WRITE(VLV_IIR, 0xffffffff);
> -       I915_WRITE(VLV_IIR, 0xffffffff);
> -       POSTING_READ(VLV_IIR);
> +
> +       GEN5_IRQ_RESET(VLV_);
>  }
>
>  static void gen8_gt_irq_reset(struct drm_i915_private *dev_priv)
> @@ -3197,11 +3194,7 @@ static void cherryview_irq_preinstall(struct drm_device *dev)
>         for_each_pipe(dev_priv, pipe)
>                 I915_WRITE(PIPESTAT(pipe), 0xffff);
>
> -       I915_WRITE(VLV_IMR, 0xffffffff);
> -       I915_WRITE(VLV_IER, 0x0);
> -       I915_WRITE(VLV_IIR, 0xffffffff);
> -       I915_WRITE(VLV_IIR, 0xffffffff);
> -       POSTING_READ(VLV_IIR);
> +       GEN5_IRQ_RESET(VLV_);
>  }
>
>  static void ibx_hpd_irq_setup(struct drm_device *dev)
> @@ -3611,11 +3604,7 @@ static void valleyview_irq_uninstall(struct drm_device *dev)
>
>         dev_priv->irq_mask = 0;
>
> -       I915_WRITE(VLV_IMR, 0xffffffff);
> -       I915_WRITE(VLV_IER, 0x0);
> -       I915_WRITE(VLV_IIR, 0xffffffff);
> -       I915_WRITE(VLV_IIR, 0xffffffff);
> -       POSTING_READ(VLV_IIR);
> +       GEN5_IRQ_RESET(VLV_);
>  }
>
>  static void cherryview_irq_uninstall(struct drm_device *dev)
> @@ -3639,11 +3628,7 @@ static void cherryview_irq_uninstall(struct drm_device *dev)
>         for_each_pipe(dev_priv, pipe)
>                 I915_WRITE(PIPESTAT(pipe), 0xffff);
>
> -       I915_WRITE(VLV_IMR, 0xffffffff);
> -       I915_WRITE(VLV_IER, 0x0);
> -       I915_WRITE(VLV_IIR, 0xffffffff);
> -       I915_WRITE(VLV_IIR, 0xffffffff);
> -       POSTING_READ(VLV_IIR);
> +       GEN5_IRQ_RESET(VLV_);
>  }
>
>  static void ironlake_irq_uninstall(struct drm_device *dev)
> --
> 2.0.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Paulo Zanoni