[Intel-gfx] [PATCH 21/30] drm/i915: remove explicit CNL handling from intel_pch.c

[Rodrigo Vivi]

On Fri, Jul 23, 2021 at 05:11:05PM -0700, Lucas De Marchi wrote:
> Remove references for CNL from pch detection.

for a moment I almost thought you were removing the CNP support...

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

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

> ---
>  drivers/gpu/drm/i915/intel_pch.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pch.c b/drivers/gpu/drm/i915/intel_pch.c
> index cc44164e242b..d1d4b97b86f5 100644
> --- a/drivers/gpu/drm/i915/intel_pch.c
> +++ b/drivers/gpu/drm/i915/intel_pch.c
> @@ -81,7 +81,6 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
>  	case INTEL_PCH_CNP_DEVICE_ID_TYPE:
>  		drm_dbg_kms(&dev_priv->drm, "Found Cannon Lake PCH (CNP)\n");
>  		drm_WARN_ON(&dev_priv->drm,
> -			    !IS_CANNONLAKE(dev_priv) &&
>  			    !IS_COFFEELAKE(dev_priv) &&
>  			    !IS_COMETLAKE(dev_priv));
>  		return PCH_CNP;
> @@ -89,7 +88,6 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
>  		drm_dbg_kms(&dev_priv->drm,
>  			    "Found Cannon Lake LP PCH (CNP-LP)\n");
>  		drm_WARN_ON(&dev_priv->drm,
> -			    !IS_CANNONLAKE(dev_priv) &&
>  			    !IS_COFFEELAKE(dev_priv) &&
>  			    !IS_COMETLAKE(dev_priv));
>  		return PCH_CNP;
> @@ -171,8 +169,7 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv,
>  		id = INTEL_PCH_MCC_DEVICE_ID_TYPE;
>  	else if (IS_ICELAKE(dev_priv))
>  		id = INTEL_PCH_ICP_DEVICE_ID_TYPE;
> -	else if (IS_CANNONLAKE(dev_priv) ||
> -		 IS_COFFEELAKE(dev_priv) ||
> +	else if (IS_COFFEELAKE(dev_priv) ||
>  		 IS_COMETLAKE(dev_priv))
>  		id = INTEL_PCH_CNP_DEVICE_ID_TYPE;
>  	else if (IS_KABYLAKE(dev_priv) || IS_SKYLAKE(dev_priv))
> -- 
> 2.31.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx