[PATCH 18/30] drm/i915: remove explicit CNL handling from i915_irq.c

[Rodrigo Vivi]

On Fri, Jul 23, 2021 at 05:11:02PM -0700, Lucas De Marchi wrote:
> Remove special handling of PORT_F in i915_irq.c and only do it for
> DISPLAY_VER == 11.

oh! ignore my previous thought about removing the port F...

> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>


Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>


> ---
>  drivers/gpu/drm/i915/i915_irq.c | 7 +++----
>  drivers/gpu/drm/i915/i915_reg.h | 2 +-
>  2 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index e2171bd2820e..17d336218b67 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -2297,11 +2297,10 @@ static u32 gen8_de_port_aux_mask(struct drm_i915_private *dev_priv)
>  			GEN9_AUX_CHANNEL_C |
>  			GEN9_AUX_CHANNEL_D;
>  
> -	if (IS_CNL_WITH_PORT_F(dev_priv) || DISPLAY_VER(dev_priv) == 11)
> -		mask |= CNL_AUX_CHANNEL_F;
> -
> -	if (DISPLAY_VER(dev_priv) == 11)
> +	if (DISPLAY_VER(dev_priv) == 11) {
> +		mask |= ICL_AUX_CHANNEL_F;
>  		mask |= ICL_AUX_CHANNEL_E;
> +	}
>  
>  	return mask;
>  }
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index d198b1a2d4b5..fdc8fd424d36 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -7945,7 +7945,7 @@ enum {
>  #define  DSI1_NON_TE			(1 << 31)
>  #define  DSI0_NON_TE			(1 << 30)
>  #define  ICL_AUX_CHANNEL_E		(1 << 29)
> -#define  CNL_AUX_CHANNEL_F		(1 << 28)
> +#define  ICL_AUX_CHANNEL_F		(1 << 28)
>  #define  GEN9_AUX_CHANNEL_D		(1 << 27)
>  #define  GEN9_AUX_CHANNEL_C		(1 << 26)
>  #define  GEN9_AUX_CHANNEL_B		(1 << 25)
> -- 
> 2.31.1
>