[Intel-gfx] [PATCH 4/5] drm/i915: Extract {i9xx, i965)_error_mask()

[Govindapillai, Vinod]

Hi,


On Wed, 2023-01-25 at 20:52 +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> Pull the EMR calculation into small helpers.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/i915_irq.c | 46 ++++++++++++++++++---------------
>  1 file changed, 25 insertions(+), 21 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 0e90c348175e..081b79d00521 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -3471,15 +3471,18 @@ static void i8xx_irq_reset(struct drm_i915_private *dev_priv)
>         dev_priv->irq_mask = ~0u;
>  }
>  
> +static u32 i9xx_error_mask(struct drm_i915_private *i915)
> +{
> +       return ~(I915_ERROR_PAGE_TABLE |
> +                I915_ERROR_MEMORY_REFRESH);
> +}
> +
>  static void i8xx_irq_postinstall(struct drm_i915_private *dev_priv)
>  {
>         struct intel_uncore *uncore = &dev_priv->uncore;
>         u16 enable_mask;
>  
> -       intel_uncore_write16(uncore,
> -                            EMR,
> -                            ~(I915_ERROR_PAGE_TABLE |
> -                              I915_ERROR_MEMORY_REFRESH));
> +       intel_uncore_write16(uncore, EMR, i9xx_error_mask(dev_priv));
>  
>         /* Unmask the interrupts that we always want on. */
>         dev_priv->irq_mask =
> @@ -3651,8 +3654,7 @@ static void i915_irq_postinstall(struct drm_i915_private *dev_priv)
>         struct intel_uncore *uncore = &dev_priv->uncore;
>         u32 enable_mask;
>  
> -       intel_uncore_write(uncore, EMR, ~(I915_ERROR_PAGE_TABLE |
> -                                         I915_ERROR_MEMORY_REFRESH));
> +       intel_uncore_write(uncore, EMR, i9xx_error_mask(dev_priv));
>  
>         /* Unmask the interrupts that we always want on. */
>         dev_priv->irq_mask =
> @@ -3755,26 +3757,28 @@ static void i965_irq_reset(struct drm_i915_private *dev_priv)
>         dev_priv->irq_mask = ~0u;
>  }
>  
> -static void i965_irq_postinstall(struct drm_i915_private *dev_priv)
> +static u32 i965_error_mask(struct drm_i915_private *i915)
>  {
> -       struct intel_uncore *uncore = &dev_priv->uncore;
> -       u32 enable_mask;
> -       u32 error_mask;
> -
>         /*
>          * Enable some error detection, note the instruction error mask
>          * bit is reserved, so we leave it masked.
>          */
> -       if (IS_G4X(dev_priv)) {
> -               error_mask = ~(GM45_ERROR_PAGE_TABLE |
> -                              GM45_ERROR_MEM_PRIV |
> -                              GM45_ERROR_CP_PRIV |
> -                              I915_ERROR_MEMORY_REFRESH);
> -       } else {
> -               error_mask = ~(I915_ERROR_PAGE_TABLE |
> -                              I915_ERROR_MEMORY_REFRESH);
> -       }
> -       intel_uncore_write(uncore, EMR, error_mask);
> +       if (IS_G4X(i915))
> +               return ~(GM45_ERROR_PAGE_TABLE |
> +                        GM45_ERROR_MEM_PRIV |
> +                        GM45_ERROR_CP_PRIV |
> +                        I915_ERROR_MEMORY_REFRESH);
> +       else
> +               return ~(I915_ERROR_PAGE_TABLE |
> +                        I915_ERROR_MEMORY_REFRESH);

May be this could be optimized to -> return i9xx_error_mask(i915) too?

In any case, 

Reviewed-by: Vinod Govindapillai <vinod.govindapillai at intel.com>

> +}
> +
> +static void i965_irq_postinstall(struct drm_i915_private *dev_priv)
> +{
> +       struct intel_uncore *uncore = &dev_priv->uncore;
> +       u32 enable_mask;
> +
> +       intel_uncore_write(uncore, EMR, i965_error_mask(dev_priv));
>  
>         /* Unmask the interrupts that we always want on. */
>         dev_priv->irq_mask =