[Intel-gfx] [PATCH] drm/i915: Correct the PCH type in irq postinstall

[Matt Roper]

On Wed, Oct 16, 2019 at 11:35:14AM -0700, Vivek Kasireddy wrote:
> JasperLake PCH (JSP) has DDI HPD pin mappings similar to TGP and not
> MCC. Also add the correct HPD pin mappings for the MCC PCH.
> 
> Cc: Matt Roper <matthew.d.roper at intel.com>
> Signed-off-by: Vivek Kasireddy <vivek.kasireddy at intel.com>

Woops, yes.  Good catch.

Reviewed-by: Matt Roper <matthew.d.roper at intel.com>

> ---
>  drivers/gpu/drm/i915/i915_irq.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index ef09fbb36f37..e618f4621308 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -3803,8 +3803,11 @@ static void icp_irq_postinstall(struct drm_i915_private *dev_priv)
>  	if (HAS_PCH_TGP(dev_priv))
>  		icp_hpd_detection_setup(dev_priv, TGP_DDI_HPD_ENABLE_MASK,
>  					TGP_TC_HPD_ENABLE_MASK);
> -	else if (HAS_PCH_MCC(dev_priv))
> +	else if (HAS_PCH_JSP(dev_priv))
>  		icp_hpd_detection_setup(dev_priv, TGP_DDI_HPD_ENABLE_MASK, 0);
> +	else if (HAS_PCH_MCC(dev_priv))
> +		icp_hpd_detection_setup(dev_priv, ICP_DDI_HPD_ENABLE_MASK,
> +					ICP_TC_HPD_ENABLE(PORT_TC1));
>  	else
>  		icp_hpd_detection_setup(dev_priv, ICP_DDI_HPD_ENABLE_MASK,
>  					ICP_TC_HPD_ENABLE_MASK);
> -- 
> 2.21.0
> 

-- 
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795