drm/i915: Correct the PCH type in irq postinstall

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@intel.com>
Signed-off-by: Vivek Kasireddy <vivek.kasireddy@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191016183514.11128-1-vivek.kasireddy@intel.com

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index ef09fbb..e618f46 100644 (file)
--- 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);