Merge tag 'drm-intel-next-2019-10-07' of git://anongit.freedesktop.org/drm/drm-intel...
[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / display / intel_ddi.c
index 8eb2b3e..3c1e885 100644 (file)
@@ -586,6 +586,26 @@ static const struct icl_mg_phy_ddi_buf_trans icl_mg_phy_ddi_translations[] = {
        { 0x0, 0x00, 0x00 },    /* 3              0   */
 };
 
+struct tgl_dkl_phy_ddi_buf_trans {
+       u32 dkl_vswing_control;
+       u32 dkl_preshoot_control;
+       u32 dkl_de_emphasis_control;
+};
+
+static const struct tgl_dkl_phy_ddi_buf_trans tgl_dkl_phy_ddi_translations[] = {
+                               /* VS   pre-emp Non-trans mV    Pre-emph dB */
+       { 0x7, 0x0, 0x00 },     /* 0    0       400mV           0 dB */
+       { 0x5, 0x0, 0x03 },     /* 0    1       400mV           3.5 dB */
+       { 0x2, 0x0, 0x0b },     /* 0    2       400mV           6 dB */
+       { 0x0, 0x0, 0x19 },     /* 0    3       400mV           9.5 dB */
+       { 0x5, 0x0, 0x00 },     /* 1    0       600mV           0 dB */
+       { 0x2, 0x0, 0x03 },     /* 1    1       600mV           3.5 dB */
+       { 0x0, 0x0, 0x14 },     /* 1    2       600mV           6 dB */
+       { 0x2, 0x0, 0x00 },     /* 2    0       800mV           0 dB */
+       { 0x0, 0x0, 0x0B },     /* 2    1       800mV           3.5 dB */
+       { 0x0, 0x0, 0x00 },     /* 3    0       1200mV          0 dB HDMI default */
+};
+
 static const struct ddi_buf_trans *
 bdw_get_buf_trans_edp(struct drm_i915_private *dev_priv, int *n_entries)
 {
@@ -872,7 +892,14 @@ static int intel_ddi_hdmi_level(struct drm_i915_private *dev_priv, enum port por
 
        level = dev_priv->vbt.ddi_port_info[port].hdmi_level_shift;
 
-       if (INTEL_GEN(dev_priv) >= 11) {
+       if (INTEL_GEN(dev_priv) >= 12) {
+               if (intel_phy_is_combo(dev_priv, phy))
+                       icl_get_combo_buf_trans(dev_priv, INTEL_OUTPUT_HDMI,
+                                               0, &n_entries);
+               else
+                       n_entries = ARRAY_SIZE(tgl_dkl_phy_ddi_translations);
+               default_entry = n_entries - 1;
+       } else if (INTEL_GEN(dev_priv) == 11) {
                if (intel_phy_is_combo(dev_priv, phy))
                        icl_get_combo_buf_trans(dev_priv, INTEL_OUTPUT_HDMI,
                                                0, &n_entries);
@@ -1049,6 +1076,8 @@ static u32 icl_pll_to_ddi_clk_sel(struct intel_encoder *encoder,
        case DPLL_ID_ICL_MGPLL2:
        case DPLL_ID_ICL_MGPLL3:
        case DPLL_ID_ICL_MGPLL4:
+       case DPLL_ID_TGL_MGPLL5:
+       case DPLL_ID_TGL_MGPLL6:
                return DDI_CLK_SEL_MG;
        }
 }
@@ -1413,11 +1442,30 @@ static int icl_calc_mg_pll_link(struct drm_i915_private *dev_priv,
 
        ref_clock = dev_priv->cdclk.hw.ref;
 
-       m1 = pll_state->mg_pll_div1 & MG_PLL_DIV1_FBPREDIV_MASK;
-       m2_int = pll_state->mg_pll_div0 & MG_PLL_DIV0_FBDIV_INT_MASK;
-       m2_frac = (pll_state->mg_pll_div0 & MG_PLL_DIV0_FRACNEN_H) ?
-               (pll_state->mg_pll_div0 & MG_PLL_DIV0_FBDIV_FRAC_MASK) >>
-               MG_PLL_DIV0_FBDIV_FRAC_SHIFT : 0;
+       if (INTEL_GEN(dev_priv) >= 12) {
+               m1 = pll_state->mg_pll_div0 & DKL_PLL_DIV0_FBPREDIV_MASK;
+               m1 = m1 >> DKL_PLL_DIV0_FBPREDIV_SHIFT;
+               m2_int = pll_state->mg_pll_div0 & DKL_PLL_DIV0_FBDIV_INT_MASK;
+
+               if (pll_state->mg_pll_bias & DKL_PLL_BIAS_FRAC_EN_H) {
+                       m2_frac = pll_state->mg_pll_bias &
+                                 DKL_PLL_BIAS_FBDIV_FRAC_MASK;
+                       m2_frac = m2_frac >> DKL_PLL_BIAS_FBDIV_SHIFT;
+               } else {
+                       m2_frac = 0;
+               }
+       } else {
+               m1 = pll_state->mg_pll_div1 & MG_PLL_DIV1_FBPREDIV_MASK;
+               m2_int = pll_state->mg_pll_div0 & MG_PLL_DIV0_FBDIV_INT_MASK;
+
+               if (pll_state->mg_pll_div0 & MG_PLL_DIV0_FRACNEN_H) {
+                       m2_frac = pll_state->mg_pll_div0 &
+                                 MG_PLL_DIV0_FBDIV_FRAC_MASK;
+                       m2_frac = m2_frac >> MG_PLL_DIV0_FBDIV_FRAC_SHIFT;
+               } else {
+                       m2_frac = 0;
+               }
+       }
 
        switch (pll_state->mg_clktop2_hsclkctl &
                MG_CLKTOP2_HSCLKCTL_HSDIV_RATIO_MASK) {
@@ -1706,9 +1754,6 @@ void intel_ddi_set_pipe_settings(const struct intel_crtc_state *crtc_state)
 
        temp = TRANS_MSA_SYNC_CLK;
 
-       if (crtc_state->limited_color_range)
-               temp |= TRANS_MSA_CEA_RANGE;
-
        switch (crtc_state->pipe_bpp) {
        case 18:
                temp |= TRANS_MSA_6_BPC;
@@ -1727,13 +1772,22 @@ void intel_ddi_set_pipe_settings(const struct intel_crtc_state *crtc_state)
                break;
        }
 
+       /* nonsense combination */
+       WARN_ON(crtc_state->limited_color_range &&
+               crtc_state->output_format != INTEL_OUTPUT_FORMAT_RGB);
+
+       if (crtc_state->limited_color_range)
+               temp |= TRANS_MSA_CEA_RANGE;
+
        /*
         * As per DP 1.2 spec section 2.3.4.3 while sending
         * YCBCR 444 signals we should program MSA MISC1/0 fields with
-        * colorspace information. The output colorspace encoding is BT601.
+        * colorspace information.
         */
        if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR444)
-               temp |= TRANS_MSA_SAMPLING_444 | TRANS_MSA_CLRSP_YCBCR;
+               temp |= TRANS_MSA_SAMPLING_444 | TRANS_MSA_CLRSP_YCBCR |
+                       TRANS_MSA_YCBCR_BT709;
+
        /*
         * As per DP 1.4a spec section 2.2.4.3 [MSA Field for Indication
         * of Color Encoding Format and Content Color Gamut] while sending
@@ -1761,7 +1815,14 @@ void intel_ddi_set_vc_payload_alloc(const struct intel_crtc_state *crtc_state,
        I915_WRITE(TRANS_DDI_FUNC_CTL(cpu_transcoder), temp);
 }
 
-void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state)
+/*
+ * Returns the TRANS_DDI_FUNC_CTL value based on CRTC state.
+ *
+ * Only intended to be used by intel_ddi_enable_transcoder_func() and
+ * intel_ddi_config_transcoder_func().
+ */
+static u32
+intel_ddi_transcoder_func_reg_val_get(const struct intel_crtc_state *crtc_state)
 {
        struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
        struct intel_encoder *encoder = intel_ddi_get_crtc_encoder(crtc);
@@ -1845,6 +1906,34 @@ void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state)
                temp |= DDI_PORT_WIDTH(crtc_state->lane_count);
        }
 
+       return temp;
+}
+
+void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state)
+{
+       struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
+       struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
+       enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
+       u32 temp;
+
+       temp = intel_ddi_transcoder_func_reg_val_get(crtc_state);
+       I915_WRITE(TRANS_DDI_FUNC_CTL(cpu_transcoder), temp);
+}
+
+/*
+ * Same as intel_ddi_enable_transcoder_func(), but it does not set the enable
+ * bit.
+ */
+static void
+intel_ddi_config_transcoder_func(const struct intel_crtc_state *crtc_state)
+{
+       struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
+       struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
+       enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
+       u32 temp;
+
+       temp = intel_ddi_transcoder_func_reg_val_get(crtc_state);
+       temp &= ~TRANS_DDI_FUNC_ENABLE;
        I915_WRITE(TRANS_DDI_FUNC_CTL(cpu_transcoder), temp);
 }
 
@@ -2045,18 +2134,20 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder,
        }
 
        if (!*pipe_mask)
-               DRM_DEBUG_KMS("No pipe for ddi port %c found\n",
-                             port_name(port));
+               DRM_DEBUG_KMS("No pipe for [ENCODER:%d:%s] found\n",
+                             encoder->base.base.id, encoder->base.name);
 
        if (!mst_pipe_mask && hweight8(*pipe_mask) > 1) {
-               DRM_DEBUG_KMS("Multiple pipes for non DP-MST port %c (pipe_mask %02x)\n",
-                             port_name(port), *pipe_mask);
+               DRM_DEBUG_KMS("Multiple pipes for [ENCODER:%d:%s] (pipe_mask %02x)\n",
+                             encoder->base.base.id, encoder->base.name,
+                             *pipe_mask);
                *pipe_mask = BIT(ffs(*pipe_mask) - 1);
        }
 
        if (mst_pipe_mask && mst_pipe_mask != *pipe_mask)
-               DRM_DEBUG_KMS("Conflicting MST and non-MST encoders for port %c (pipe_mask %02x mst_pipe_mask %02x)\n",
-                             port_name(port), *pipe_mask, mst_pipe_mask);
+               DRM_DEBUG_KMS("Conflicting MST and non-MST state for [ENCODER:%d:%s] (pipe_mask %02x mst_pipe_mask %02x)\n",
+                             encoder->base.base.id, encoder->base.name,
+                             *pipe_mask, mst_pipe_mask);
        else
                *is_dp_mst = mst_pipe_mask;
 
@@ -2066,8 +2157,9 @@ out:
                if ((tmp & (BXT_PHY_CMNLANE_POWERDOWN_ACK |
                            BXT_PHY_LANE_POWERDOWN_ACK |
                            BXT_PHY_LANE_ENABLED)) != BXT_PHY_LANE_ENABLED)
-                       DRM_ERROR("Port %c enabled but PHY powered down? "
-                                 "(PHY_CTL %08x)\n", port_name(port), tmp);
+                       DRM_ERROR("[ENCODER:%d:%s] enabled but PHY powered down? "
+                                 "(PHY_CTL %08x)\n", encoder->base.base.id,
+                                 encoder->base.name, tmp);
        }
 
        intel_display_power_put(dev_priv, encoder->power_domain, wakeref);
@@ -2269,7 +2361,13 @@ u8 intel_ddi_dp_voltage_max(struct intel_encoder *encoder)
        enum phy phy = intel_port_to_phy(dev_priv, port);
        int n_entries;
 
-       if (INTEL_GEN(dev_priv) >= 11) {
+       if (INTEL_GEN(dev_priv) >= 12) {
+               if (intel_phy_is_combo(dev_priv, phy))
+                       icl_get_combo_buf_trans(dev_priv, encoder->type,
+                                               intel_dp->link_rate, &n_entries);
+               else
+                       n_entries = ARRAY_SIZE(tgl_dkl_phy_ddi_translations);
+       } else if (INTEL_GEN(dev_priv) == 11) {
                if (intel_phy_is_combo(dev_priv, phy))
                        icl_get_combo_buf_trans(dev_priv, encoder->type,
                                                intel_dp->link_rate, &n_entries);
@@ -2583,7 +2681,7 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder,
                                           u32 level)
 {
        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
-       enum port port = encoder->port;
+       enum tc_port tc_port = intel_port_to_tc(dev_priv, encoder->port);
        const struct icl_mg_phy_ddi_buf_trans *ddi_translations;
        u32 n_entries, val;
        int ln;
@@ -2599,33 +2697,33 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder,
 
        /* Set MG_TX_LINK_PARAMS cri_use_fs32 to 0. */
        for (ln = 0; ln < 2; ln++) {
-               val = I915_READ(MG_TX1_LINK_PARAMS(ln, port));
+               val = I915_READ(MG_TX1_LINK_PARAMS(ln, tc_port));
                val &= ~CRI_USE_FS32;
-               I915_WRITE(MG_TX1_LINK_PARAMS(ln, port), val);
+               I915_WRITE(MG_TX1_LINK_PARAMS(ln, tc_port), val);
 
-               val = I915_READ(MG_TX2_LINK_PARAMS(ln, port));
+               val = I915_READ(MG_TX2_LINK_PARAMS(ln, tc_port));
                val &= ~CRI_USE_FS32;
-               I915_WRITE(MG_TX2_LINK_PARAMS(ln, port), val);
+               I915_WRITE(MG_TX2_LINK_PARAMS(ln, tc_port), val);
        }
 
        /* Program MG_TX_SWINGCTRL with values from vswing table */
        for (ln = 0; ln < 2; ln++) {
-               val = I915_READ(MG_TX1_SWINGCTRL(ln, port));
+               val = I915_READ(MG_TX1_SWINGCTRL(ln, tc_port));
                val &= ~CRI_TXDEEMPH_OVERRIDE_17_12_MASK;
                val |= CRI_TXDEEMPH_OVERRIDE_17_12(
                        ddi_translations[level].cri_txdeemph_override_17_12);
-               I915_WRITE(MG_TX1_SWINGCTRL(ln, port), val);
+               I915_WRITE(MG_TX1_SWINGCTRL(ln, tc_port), val);
 
-               val = I915_READ(MG_TX2_SWINGCTRL(ln, port));
+               val = I915_READ(MG_TX2_SWINGCTRL(ln, tc_port));
                val &= ~CRI_TXDEEMPH_OVERRIDE_17_12_MASK;
                val |= CRI_TXDEEMPH_OVERRIDE_17_12(
                        ddi_translations[level].cri_txdeemph_override_17_12);
-               I915_WRITE(MG_TX2_SWINGCTRL(ln, port), val);
+               I915_WRITE(MG_TX2_SWINGCTRL(ln, tc_port), val);
        }
 
        /* Program MG_TX_DRVCTRL with values from vswing table */
        for (ln = 0; ln < 2; ln++) {
-               val = I915_READ(MG_TX1_DRVCTRL(ln, port));
+               val = I915_READ(MG_TX1_DRVCTRL(ln, tc_port));
                val &= ~(CRI_TXDEEMPH_OVERRIDE_11_6_MASK |
                         CRI_TXDEEMPH_OVERRIDE_5_0_MASK);
                val |= CRI_TXDEEMPH_OVERRIDE_5_0(
@@ -2633,9 +2731,9 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder,
                        CRI_TXDEEMPH_OVERRIDE_11_6(
                                ddi_translations[level].cri_txdeemph_override_11_6) |
                        CRI_TXDEEMPH_OVERRIDE_EN;
-               I915_WRITE(MG_TX1_DRVCTRL(ln, port), val);
+               I915_WRITE(MG_TX1_DRVCTRL(ln, tc_port), val);
 
-               val = I915_READ(MG_TX2_DRVCTRL(ln, port));
+               val = I915_READ(MG_TX2_DRVCTRL(ln, tc_port));
                val &= ~(CRI_TXDEEMPH_OVERRIDE_11_6_MASK |
                         CRI_TXDEEMPH_OVERRIDE_5_0_MASK);
                val |= CRI_TXDEEMPH_OVERRIDE_5_0(
@@ -2643,7 +2741,7 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder,
                        CRI_TXDEEMPH_OVERRIDE_11_6(
                                ddi_translations[level].cri_txdeemph_override_11_6) |
                        CRI_TXDEEMPH_OVERRIDE_EN;
-               I915_WRITE(MG_TX2_DRVCTRL(ln, port), val);
+               I915_WRITE(MG_TX2_DRVCTRL(ln, tc_port), val);
 
                /* FIXME: Program CRI_LOADGEN_SEL after the spec is updated */
        }
@@ -2654,17 +2752,17 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder,
         * values from table for which TX1 and TX2 enabled.
         */
        for (ln = 0; ln < 2; ln++) {
-               val = I915_READ(MG_CLKHUB(ln, port));
+               val = I915_READ(MG_CLKHUB(ln, tc_port));
                if (link_clock < 300000)
                        val |= CFG_LOW_RATE_LKREN_EN;
                else
                        val &= ~CFG_LOW_RATE_LKREN_EN;
-               I915_WRITE(MG_CLKHUB(ln, port), val);
+               I915_WRITE(MG_CLKHUB(ln, tc_port), val);
        }
 
        /* Program the MG_TX_DCC<LN, port being used> based on the link frequency */
        for (ln = 0; ln < 2; ln++) {
-               val = I915_READ(MG_TX1_DCC(ln, port));
+               val = I915_READ(MG_TX1_DCC(ln, tc_port));
                val &= ~CFG_AMI_CK_DIV_OVERRIDE_VAL_MASK;
                if (link_clock <= 500000) {
                        val &= ~CFG_AMI_CK_DIV_OVERRIDE_EN;
@@ -2672,9 +2770,9 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder,
                        val |= CFG_AMI_CK_DIV_OVERRIDE_EN |
                                CFG_AMI_CK_DIV_OVERRIDE_VAL(1);
                }
-               I915_WRITE(MG_TX1_DCC(ln, port), val);
+               I915_WRITE(MG_TX1_DCC(ln, tc_port), val);
 
-               val = I915_READ(MG_TX2_DCC(ln, port));
+               val = I915_READ(MG_TX2_DCC(ln, tc_port));
                val &= ~CFG_AMI_CK_DIV_OVERRIDE_VAL_MASK;
                if (link_clock <= 500000) {
                        val &= ~CFG_AMI_CK_DIV_OVERRIDE_EN;
@@ -2682,18 +2780,18 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder,
                        val |= CFG_AMI_CK_DIV_OVERRIDE_EN |
                                CFG_AMI_CK_DIV_OVERRIDE_VAL(1);
                }
-               I915_WRITE(MG_TX2_DCC(ln, port), val);
+               I915_WRITE(MG_TX2_DCC(ln, tc_port), val);
        }
 
        /* Program MG_TX_PISO_READLOAD with values from vswing table */
        for (ln = 0; ln < 2; ln++) {
-               val = I915_READ(MG_TX1_PISO_READLOAD(ln, port));
+               val = I915_READ(MG_TX1_PISO_READLOAD(ln, tc_port));
                val |= CRI_CALCINIT;
-               I915_WRITE(MG_TX1_PISO_READLOAD(ln, port), val);
+               I915_WRITE(MG_TX1_PISO_READLOAD(ln, tc_port), val);
 
-               val = I915_READ(MG_TX2_PISO_READLOAD(ln, port));
+               val = I915_READ(MG_TX2_PISO_READLOAD(ln, tc_port));
                val |= CRI_CALCINIT;
-               I915_WRITE(MG_TX2_PISO_READLOAD(ln, port), val);
+               I915_WRITE(MG_TX2_PISO_READLOAD(ln, tc_port), val);
        }
 }
 
@@ -2711,6 +2809,62 @@ static void icl_ddi_vswing_sequence(struct intel_encoder *encoder,
                icl_mg_phy_ddi_vswing_sequence(encoder, link_clock, level);
 }
 
+static void
+tgl_dkl_phy_ddi_vswing_sequence(struct intel_encoder *encoder, int link_clock,
+                               u32 level)
+{
+       struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+       enum tc_port tc_port = intel_port_to_tc(dev_priv, encoder->port);
+       const struct tgl_dkl_phy_ddi_buf_trans *ddi_translations;
+       u32 n_entries, val, ln, dpcnt_mask, dpcnt_val;
+
+       n_entries = ARRAY_SIZE(tgl_dkl_phy_ddi_translations);
+       ddi_translations = tgl_dkl_phy_ddi_translations;
+
+       if (level >= n_entries)
+               level = n_entries - 1;
+
+       dpcnt_mask = (DKL_TX_PRESHOOT_COEFF_MASK |
+                     DKL_TX_DE_EMPAHSIS_COEFF_MASK |
+                     DKL_TX_VSWING_CONTROL_MASK);
+       dpcnt_val = DKL_TX_VSWING_CONTROL(ddi_translations[level].dkl_vswing_control);
+       dpcnt_val |= DKL_TX_DE_EMPHASIS_COEFF(ddi_translations[level].dkl_de_emphasis_control);
+       dpcnt_val |= DKL_TX_PRESHOOT_COEFF(ddi_translations[level].dkl_preshoot_control);
+
+       for (ln = 0; ln < 2; ln++) {
+               I915_WRITE(HIP_INDEX_REG(tc_port), HIP_INDEX_VAL(tc_port, ln));
+
+               /* All the registers are RMW */
+               val = I915_READ(DKL_TX_DPCNTL0(tc_port));
+               val &= ~dpcnt_mask;
+               val |= dpcnt_val;
+               I915_WRITE(DKL_TX_DPCNTL0(tc_port), val);
+
+               val = I915_READ(DKL_TX_DPCNTL1(tc_port));
+               val &= ~dpcnt_mask;
+               val |= dpcnt_val;
+               I915_WRITE(DKL_TX_DPCNTL1(tc_port), val);
+
+               val = I915_READ(DKL_TX_DPCNTL2(tc_port));
+               val &= ~DKL_TX_DP20BITMODE;
+               I915_WRITE(DKL_TX_DPCNTL2(tc_port), val);
+       }
+}
+
+static void tgl_ddi_vswing_sequence(struct intel_encoder *encoder,
+                                   int link_clock,
+                                   u32 level,
+                                   enum intel_output_type type)
+{
+       struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+       enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
+
+       if (intel_phy_is_combo(dev_priv, phy))
+               icl_combo_phy_ddi_vswing_sequence(encoder, level, type);
+       else
+               tgl_dkl_phy_ddi_vswing_sequence(encoder, link_clock, level);
+}
+
 static u32 translate_signal_level(int signal_levels)
 {
        int i;
@@ -2742,7 +2896,10 @@ u32 bxt_signal_levels(struct intel_dp *intel_dp)
        struct intel_encoder *encoder = &dport->base;
        int level = intel_ddi_dp_level(intel_dp);
 
-       if (INTEL_GEN(dev_priv) >= 11)
+       if (INTEL_GEN(dev_priv) >= 12)
+               tgl_ddi_vswing_sequence(encoder, intel_dp->link_rate,
+                                       level, encoder->type);
+       else if (INTEL_GEN(dev_priv) >= 11)
                icl_ddi_vswing_sequence(encoder, intel_dp->link_rate,
                                        level, encoder->type);
        else if (IS_CANNONLAKE(dev_priv))
@@ -2989,130 +3146,141 @@ static void intel_ddi_clk_disable(struct intel_encoder *encoder)
        }
 }
 
-static void icl_enable_phy_clock_gating(struct intel_digital_port *dig_port)
+static void
+icl_phy_set_clock_gating(struct intel_digital_port *dig_port, bool enable)
 {
        struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
-       enum port port = dig_port->base.port;
-       enum tc_port tc_port = intel_port_to_tc(dev_priv, port);
-       u32 val;
+       enum tc_port tc_port = intel_port_to_tc(dev_priv, dig_port->base.port);
+       u32 val, bits;
        int ln;
 
        if (tc_port == PORT_TC_NONE)
                return;
 
-       for (ln = 0; ln < 2; ln++) {
-               val = I915_READ(MG_DP_MODE(ln, port));
-               val |= MG_DP_MODE_CFG_TR2PWR_GATING |
-                      MG_DP_MODE_CFG_TRPWR_GATING |
-                      MG_DP_MODE_CFG_CLNPWR_GATING |
-                      MG_DP_MODE_CFG_DIGPWR_GATING |
-                      MG_DP_MODE_CFG_GAONPWR_GATING;
-               I915_WRITE(MG_DP_MODE(ln, port), val);
-       }
-
-       val = I915_READ(MG_MISC_SUS0(tc_port));
-       val |= MG_MISC_SUS0_SUSCLK_DYNCLKGATE_MODE(3) |
-              MG_MISC_SUS0_CFG_TR2PWR_GATING |
-              MG_MISC_SUS0_CFG_CL2PWR_GATING |
-              MG_MISC_SUS0_CFG_GAONPWR_GATING |
-              MG_MISC_SUS0_CFG_TRPWR_GATING |
-              MG_MISC_SUS0_CFG_CL1PWR_GATING |
-              MG_MISC_SUS0_CFG_DGPWR_GATING;
-       I915_WRITE(MG_MISC_SUS0(tc_port), val);
-}
+       bits = MG_DP_MODE_CFG_TR2PWR_GATING | MG_DP_MODE_CFG_TRPWR_GATING |
+              MG_DP_MODE_CFG_CLNPWR_GATING | MG_DP_MODE_CFG_DIGPWR_GATING |
+              MG_DP_MODE_CFG_GAONPWR_GATING;
 
-static void icl_disable_phy_clock_gating(struct intel_digital_port *dig_port)
-{
-       struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
-       enum port port = dig_port->base.port;
-       enum tc_port tc_port = intel_port_to_tc(dev_priv, port);
-       u32 val;
-       int ln;
+       for (ln = 0; ln < 2; ln++) {
+               if (INTEL_GEN(dev_priv) >= 12) {
+                       I915_WRITE(HIP_INDEX_REG(tc_port), HIP_INDEX_VAL(tc_port, ln));
+                       val = I915_READ(DKL_DP_MODE(tc_port));
+               } else {
+                       val = I915_READ(MG_DP_MODE(ln, tc_port));
+               }
 
-       if (tc_port == PORT_TC_NONE)
-               return;
+               if (enable)
+                       val |= bits;
+               else
+                       val &= ~bits;
 
-       for (ln = 0; ln < 2; ln++) {
-               val = I915_READ(MG_DP_MODE(ln, port));
-               val &= ~(MG_DP_MODE_CFG_TR2PWR_GATING |
-                        MG_DP_MODE_CFG_TRPWR_GATING |
-                        MG_DP_MODE_CFG_CLNPWR_GATING |
-                        MG_DP_MODE_CFG_DIGPWR_GATING |
-                        MG_DP_MODE_CFG_GAONPWR_GATING);
-               I915_WRITE(MG_DP_MODE(ln, port), val);
+               if (INTEL_GEN(dev_priv) >= 12)
+                       I915_WRITE(DKL_DP_MODE(tc_port), val);
+               else
+                       I915_WRITE(MG_DP_MODE(ln, tc_port), val);
        }
 
-       val = I915_READ(MG_MISC_SUS0(tc_port));
-       val &= ~(MG_MISC_SUS0_SUSCLK_DYNCLKGATE_MODE_MASK |
-                MG_MISC_SUS0_CFG_TR2PWR_GATING |
-                MG_MISC_SUS0_CFG_CL2PWR_GATING |
-                MG_MISC_SUS0_CFG_GAONPWR_GATING |
-                MG_MISC_SUS0_CFG_TRPWR_GATING |
-                MG_MISC_SUS0_CFG_CL1PWR_GATING |
-                MG_MISC_SUS0_CFG_DGPWR_GATING);
-       I915_WRITE(MG_MISC_SUS0(tc_port), val);
+       if (INTEL_GEN(dev_priv) == 11) {
+               bits = MG_MISC_SUS0_CFG_TR2PWR_GATING |
+                      MG_MISC_SUS0_CFG_CL2PWR_GATING |
+                      MG_MISC_SUS0_CFG_GAONPWR_GATING |
+                      MG_MISC_SUS0_CFG_TRPWR_GATING |
+                      MG_MISC_SUS0_CFG_CL1PWR_GATING |
+                      MG_MISC_SUS0_CFG_DGPWR_GATING;
+
+               val = I915_READ(MG_MISC_SUS0(tc_port));
+               if (enable)
+                       val |= (bits | MG_MISC_SUS0_SUSCLK_DYNCLKGATE_MODE(3));
+               else
+                       val &= ~(bits | MG_MISC_SUS0_SUSCLK_DYNCLKGATE_MODE_MASK);
+               I915_WRITE(MG_MISC_SUS0(tc_port), val);
+       }
 }
 
-static void icl_program_mg_dp_mode(struct intel_digital_port *intel_dig_port)
+static void
+icl_program_mg_dp_mode(struct intel_digital_port *intel_dig_port,
+                      const struct intel_crtc_state *crtc_state)
 {
        struct drm_i915_private *dev_priv = to_i915(intel_dig_port->base.base.dev);
-       enum port port = intel_dig_port->base.port;
-       u32 ln0, ln1, lane_mask;
+       enum tc_port tc_port = intel_port_to_tc(dev_priv, intel_dig_port->base.port);
+       u32 ln0, ln1, pin_assignment;
+       u8 width;
 
        if (intel_dig_port->tc_mode == TC_PORT_TBT_ALT)
                return;
 
-       ln0 = I915_READ(MG_DP_MODE(0, port));
-       ln1 = I915_READ(MG_DP_MODE(1, port));
+       if (INTEL_GEN(dev_priv) >= 12) {
+               I915_WRITE(HIP_INDEX_REG(tc_port), HIP_INDEX_VAL(tc_port, 0x0));
+               ln0 = I915_READ(DKL_DP_MODE(tc_port));
+               I915_WRITE(HIP_INDEX_REG(tc_port), HIP_INDEX_VAL(tc_port, 0x1));
+               ln1 = I915_READ(DKL_DP_MODE(tc_port));
+       } else {
+               ln0 = I915_READ(MG_DP_MODE(0, tc_port));
+               ln1 = I915_READ(MG_DP_MODE(1, tc_port));
+       }
 
-       switch (intel_dig_port->tc_mode) {
-       case TC_PORT_DP_ALT:
-               ln0 &= ~(MG_DP_MODE_CFG_DP_X1_MODE | MG_DP_MODE_CFG_DP_X2_MODE);
-               ln1 &= ~(MG_DP_MODE_CFG_DP_X1_MODE | MG_DP_MODE_CFG_DP_X2_MODE);
+       ln0 &= ~(MG_DP_MODE_CFG_DP_X1_MODE | MG_DP_MODE_CFG_DP_X1_MODE);
+       ln1 &= ~(MG_DP_MODE_CFG_DP_X1_MODE | MG_DP_MODE_CFG_DP_X2_MODE);
 
-               lane_mask = intel_tc_port_get_lane_mask(intel_dig_port);
+       /* DPPATC */
+       pin_assignment = intel_tc_port_get_pin_assignment_mask(intel_dig_port);
+       width = crtc_state->lane_count;
 
-               switch (lane_mask) {
-               case 0x1:
-               case 0x4:
-                       break;
-               case 0x2:
+       switch (pin_assignment) {
+       case 0x0:
+               WARN_ON(intel_dig_port->tc_mode != TC_PORT_LEGACY);
+               if (width == 1) {
+                       ln1 |= MG_DP_MODE_CFG_DP_X1_MODE;
+               } else {
+                       ln0 |= MG_DP_MODE_CFG_DP_X2_MODE;
+                       ln1 |= MG_DP_MODE_CFG_DP_X2_MODE;
+               }
+               break;
+       case 0x1:
+               if (width == 4) {
+                       ln0 |= MG_DP_MODE_CFG_DP_X2_MODE;
+                       ln1 |= MG_DP_MODE_CFG_DP_X2_MODE;
+               }
+               break;
+       case 0x2:
+               if (width == 2) {
+                       ln0 |= MG_DP_MODE_CFG_DP_X2_MODE;
+                       ln1 |= MG_DP_MODE_CFG_DP_X2_MODE;
+               }
+               break;
+       case 0x3:
+       case 0x5:
+               if (width == 1) {
                        ln0 |= MG_DP_MODE_CFG_DP_X1_MODE;
-                       break;
-               case 0x3:
-                       ln0 |= MG_DP_MODE_CFG_DP_X1_MODE |
-                              MG_DP_MODE_CFG_DP_X2_MODE;
-                       break;
-               case 0x8:
                        ln1 |= MG_DP_MODE_CFG_DP_X1_MODE;
-                       break;
-               case 0xC:
-                       ln1 |= MG_DP_MODE_CFG_DP_X1_MODE |
-                              MG_DP_MODE_CFG_DP_X2_MODE;
-                       break;
-               case 0xF:
-                       ln0 |= MG_DP_MODE_CFG_DP_X1_MODE |
-                              MG_DP_MODE_CFG_DP_X2_MODE;
-                       ln1 |= MG_DP_MODE_CFG_DP_X1_MODE |
-                              MG_DP_MODE_CFG_DP_X2_MODE;
-                       break;
-               default:
-                       MISSING_CASE(lane_mask);
+               } else {
+                       ln0 |= MG_DP_MODE_CFG_DP_X2_MODE;
+                       ln1 |= MG_DP_MODE_CFG_DP_X2_MODE;
                }
                break;
-
-       case TC_PORT_LEGACY:
-               ln0 |= MG_DP_MODE_CFG_DP_X1_MODE | MG_DP_MODE_CFG_DP_X2_MODE;
-               ln1 |= MG_DP_MODE_CFG_DP_X1_MODE | MG_DP_MODE_CFG_DP_X2_MODE;
+       case 0x4:
+       case 0x6:
+               if (width == 1) {
+                       ln0 |= MG_DP_MODE_CFG_DP_X1_MODE;
+                       ln1 |= MG_DP_MODE_CFG_DP_X1_MODE;
+               } else {
+                       ln0 |= MG_DP_MODE_CFG_DP_X2_MODE;
+                       ln1 |= MG_DP_MODE_CFG_DP_X2_MODE;
+               }
                break;
-
        default:
-               MISSING_CASE(intel_dig_port->tc_mode);
-               return;
+               MISSING_CASE(pin_assignment);
        }
 
-       I915_WRITE(MG_DP_MODE(0, port), ln0);
-       I915_WRITE(MG_DP_MODE(1, port), ln1);
+       if (INTEL_GEN(dev_priv) >= 12) {
+               I915_WRITE(HIP_INDEX_REG(tc_port), HIP_INDEX_VAL(tc_port, 0x0));
+               I915_WRITE(DKL_DP_MODE(tc_port), ln0);
+               I915_WRITE(HIP_INDEX_REG(tc_port), HIP_INDEX_VAL(tc_port, 0x1));
+               I915_WRITE(DKL_DP_MODE(tc_port), ln1);
+       } else {
+               I915_WRITE(MG_DP_MODE(0, tc_port), ln0);
+               I915_WRITE(MG_DP_MODE(1, tc_port), ln1);
+       }
 }
 
 static void intel_dp_sink_set_fec_ready(struct intel_dp *intel_dp,
@@ -3129,17 +3297,18 @@ static void intel_ddi_enable_fec(struct intel_encoder *encoder,
                                 const struct intel_crtc_state *crtc_state)
 {
        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
-       enum port port = encoder->port;
+       struct intel_dp *intel_dp;
        u32 val;
 
        if (!crtc_state->fec_enable)
                return;
 
-       val = I915_READ(DP_TP_CTL(port));
+       intel_dp = enc_to_intel_dp(&encoder->base);
+       val = I915_READ(intel_dp->regs.dp_tp_ctl);
        val |= DP_TP_CTL_FEC_ENABLE;
-       I915_WRITE(DP_TP_CTL(port), val);
+       I915_WRITE(intel_dp->regs.dp_tp_ctl, val);
 
-       if (intel_de_wait_for_set(dev_priv, DP_TP_STATUS(port),
+       if (intel_de_wait_for_set(dev_priv, intel_dp->regs.dp_tp_status,
                                  DP_TP_STATUS_FEC_ENABLE_LIVE, 1))
                DRM_ERROR("Timed out waiting for FEC Enable Status\n");
 }
@@ -3148,21 +3317,123 @@ static void intel_ddi_disable_fec_state(struct intel_encoder *encoder,
                                        const struct intel_crtc_state *crtc_state)
 {
        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
-       enum port port = encoder->port;
+       struct intel_dp *intel_dp;
        u32 val;
 
        if (!crtc_state->fec_enable)
                return;
 
-       val = I915_READ(DP_TP_CTL(port));
+       intel_dp = enc_to_intel_dp(&encoder->base);
+       val = I915_READ(intel_dp->regs.dp_tp_ctl);
        val &= ~DP_TP_CTL_FEC_ENABLE;
-       I915_WRITE(DP_TP_CTL(port), val);
-       POSTING_READ(DP_TP_CTL(port));
+       I915_WRITE(intel_dp->regs.dp_tp_ctl, val);
+       POSTING_READ(intel_dp->regs.dp_tp_ctl);
 }
 
-static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,
-                                   const struct intel_crtc_state *crtc_state,
-                                   const struct drm_connector_state *conn_state)
+static void tgl_ddi_pre_enable_dp(struct intel_encoder *encoder,
+                                 const struct intel_crtc_state *crtc_state,
+                                 const struct drm_connector_state *conn_state)
+{
+       struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
+       struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+       enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
+       struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);
+       bool is_mst = intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST);
+       int level = intel_ddi_dp_level(intel_dp);
+       enum transcoder transcoder = crtc_state->cpu_transcoder;
+
+       intel_dp_set_link_params(intel_dp, crtc_state->port_clock,
+                                crtc_state->lane_count, is_mst);
+
+       intel_dp->regs.dp_tp_ctl = TGL_DP_TP_CTL(transcoder);
+       intel_dp->regs.dp_tp_status = TGL_DP_TP_STATUS(transcoder);
+
+       /* 1.a got on intel_atomic_commit_tail() */
+
+       /* 2. */
+       intel_edp_panel_on(intel_dp);
+
+       /*
+        * 1.b, 3. and 4.a is done before tgl_ddi_pre_enable_dp() by:
+        * haswell_crtc_enable()->intel_encoders_pre_pll_enable() and
+        * haswell_crtc_enable()->intel_enable_shared_dpll()
+        */
+
+       /* 4.b */
+       intel_ddi_clk_select(encoder, crtc_state);
+
+       /* 5. */
+       if (!intel_phy_is_tc(dev_priv, phy) ||
+           dig_port->tc_mode != TC_PORT_TBT_ALT)
+               intel_display_power_get(dev_priv,
+                                       dig_port->ddi_io_power_domain);
+
+       /* 6. */
+       icl_program_mg_dp_mode(dig_port, crtc_state);
+
+       /*
+        * 7.a - Steps in this function should only be executed over MST
+        * master, what will be taken in care by MST hook
+        * intel_mst_pre_enable_dp()
+        */
+       intel_ddi_enable_pipe_clock(crtc_state);
+
+       /* 7.b */
+       intel_ddi_config_transcoder_func(crtc_state);
+
+       /* 7.d */
+       icl_phy_set_clock_gating(dig_port, false);
+
+       /* 7.e */
+       tgl_ddi_vswing_sequence(encoder, crtc_state->port_clock, level,
+                               encoder->type);
+
+       /* 7.f */
+       if (intel_phy_is_combo(dev_priv, phy)) {
+               bool lane_reversal =
+                       dig_port->saved_port_bits & DDI_BUF_PORT_REVERSAL;
+
+               intel_combo_phy_power_up_lanes(dev_priv, phy, false,
+                                              crtc_state->lane_count,
+                                              lane_reversal);
+       }
+
+       /* 7.g */
+       intel_ddi_init_dp_buf_reg(encoder);
+
+       if (!is_mst)
+               intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
+
+       intel_dp_sink_set_decompression_state(intel_dp, crtc_state, true);
+       /*
+        * DDI FEC: "anticipates enabling FEC encoding sets the FEC_READY bit
+        * in the FEC_CONFIGURATION register to 1 before initiating link
+        * training
+        */
+       intel_dp_sink_set_fec_ready(intel_dp, crtc_state);
+       /* 7.c, 7.h, 7.i, 7.j */
+       intel_dp_start_link_train(intel_dp);
+
+       /* 7.k */
+       intel_dp_stop_link_train(intel_dp);
+
+       /*
+        * TODO: enable clock gating
+        *
+        * It is not written in DP enabling sequence but "PHY Clockgating
+        * programming" states that clock gating should be enabled after the
+        * link training but doing so causes all the following trainings to fail
+        * so not enabling it for now.
+        */
+
+       /* 7.l */
+       intel_ddi_enable_fec(encoder, crtc_state);
+       intel_dsc_enable(encoder, crtc_state);
+}
+
+static void hsw_ddi_pre_enable_dp(struct intel_encoder *encoder,
+                                 const struct intel_crtc_state *crtc_state,
+                                 const struct drm_connector_state *conn_state)
 {
        struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
@@ -3177,6 +3448,9 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,
        intel_dp_set_link_params(intel_dp, crtc_state->port_clock,
                                 crtc_state->lane_count, is_mst);
 
+       intel_dp->regs.dp_tp_ctl = DP_TP_CTL(port);
+       intel_dp->regs.dp_tp_status = DP_TP_STATUS(port);
+
        intel_edp_panel_on(intel_dp);
 
        intel_ddi_clk_select(encoder, crtc_state);
@@ -3186,8 +3460,8 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,
                intel_display_power_get(dev_priv,
                                        dig_port->ddi_io_power_domain);
 
-       icl_program_mg_dp_mode(dig_port);
-       icl_disable_phy_clock_gating(dig_port);
+       icl_program_mg_dp_mode(dig_port, crtc_state);
+       icl_phy_set_clock_gating(dig_port, false);
 
        if (INTEL_GEN(dev_priv) >= 11)
                icl_ddi_vswing_sequence(encoder, crtc_state->port_clock,
@@ -3220,7 +3494,7 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,
 
        intel_ddi_enable_fec(encoder, crtc_state);
 
-       icl_enable_phy_clock_gating(dig_port);
+       icl_phy_set_clock_gating(dig_port, true);
 
        if (!is_mst)
                intel_ddi_enable_pipe_clock(crtc_state);
@@ -3228,6 +3502,18 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,
        intel_dsc_enable(encoder, crtc_state);
 }
 
+static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,
+                                   const struct intel_crtc_state *crtc_state,
+                                   const struct drm_connector_state *conn_state)
+{
+       struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+
+       if (INTEL_GEN(dev_priv) >= 12)
+               tgl_ddi_pre_enable_dp(encoder, crtc_state, conn_state);
+       else
+               hsw_ddi_pre_enable_dp(encoder, crtc_state, conn_state);
+}
+
 static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder,
                                      const struct intel_crtc_state *crtc_state,
                                      const struct drm_connector_state *conn_state)
@@ -3244,10 +3530,13 @@ static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder,
 
        intel_display_power_get(dev_priv, dig_port->ddi_io_power_domain);
 
-       icl_program_mg_dp_mode(dig_port);
-       icl_disable_phy_clock_gating(dig_port);
+       icl_program_mg_dp_mode(dig_port, crtc_state);
+       icl_phy_set_clock_gating(dig_port, false);
 
-       if (INTEL_GEN(dev_priv) >= 11)
+       if (INTEL_GEN(dev_priv) >= 12)
+               tgl_ddi_vswing_sequence(encoder, crtc_state->port_clock,
+                                       level, INTEL_OUTPUT_HDMI);
+       else if (INTEL_GEN(dev_priv) == 11)
                icl_ddi_vswing_sequence(encoder, crtc_state->port_clock,
                                        level, INTEL_OUTPUT_HDMI);
        else if (IS_CANNONLAKE(dev_priv))
@@ -3257,7 +3546,7 @@ static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder,
        else
                intel_prepare_hdmi_ddi_buffers(encoder, level);
 
-       icl_enable_phy_clock_gating(dig_port);
+       icl_phy_set_clock_gating(dig_port, true);
 
        if (IS_GEN9_BC(dev_priv))
                skl_ddi_set_iboost(encoder, level, INTEL_OUTPUT_HDMI);
@@ -3330,10 +3619,14 @@ static void intel_disable_ddi_buf(struct intel_encoder *encoder,
                wait = true;
        }
 
-       val = I915_READ(DP_TP_CTL(port));
-       val &= ~(DP_TP_CTL_ENABLE | DP_TP_CTL_LINK_TRAIN_MASK);
-       val |= DP_TP_CTL_LINK_TRAIN_PAT1;
-       I915_WRITE(DP_TP_CTL(port), val);
+       if (intel_crtc_has_dp_encoder(crtc_state)) {
+               struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
+
+               val = I915_READ(intel_dp->regs.dp_tp_ctl);
+               val &= ~(DP_TP_CTL_ENABLE | DP_TP_CTL_LINK_TRAIN_MASK);
+               val |= DP_TP_CTL_LINK_TRAIN_PAT1;
+               I915_WRITE(intel_dp->regs.dp_tp_ctl, val);
+       }
 
        /* Disable FEC in DP Sink */
        intel_ddi_disable_fec_state(encoder, crtc_state);
@@ -3761,7 +4054,7 @@ static void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)
        u32 val;
        bool wait = false;
 
-       if (I915_READ(DP_TP_CTL(port)) & DP_TP_CTL_ENABLE) {
+       if (I915_READ(intel_dp->regs.dp_tp_ctl) & DP_TP_CTL_ENABLE) {
                val = I915_READ(DDI_BUF_CTL(port));
                if (val & DDI_BUF_CTL_ENABLE) {
                        val &= ~DDI_BUF_CTL_ENABLE;
@@ -3769,11 +4062,11 @@ static void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)
                        wait = true;
                }
 
-               val = I915_READ(DP_TP_CTL(port));
+               val = I915_READ(intel_dp->regs.dp_tp_ctl);
                val &= ~(DP_TP_CTL_ENABLE | DP_TP_CTL_LINK_TRAIN_MASK);
                val |= DP_TP_CTL_LINK_TRAIN_PAT1;
-               I915_WRITE(DP_TP_CTL(port), val);
-               POSTING_READ(DP_TP_CTL(port));
+               I915_WRITE(intel_dp->regs.dp_tp_ctl, val);
+               POSTING_READ(intel_dp->regs.dp_tp_ctl);
 
                if (wait)
                        intel_wait_ddi_buf_idle(dev_priv, port);
@@ -3788,8 +4081,8 @@ static void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)
                if (drm_dp_enhanced_frame_cap(intel_dp->dpcd))
                        val |= DP_TP_CTL_ENHANCED_FRAME_ENABLE;
        }
-       I915_WRITE(DP_TP_CTL(port), val);
-       POSTING_READ(DP_TP_CTL(port));
+       I915_WRITE(intel_dp->regs.dp_tp_ctl, val);
+       POSTING_READ(intel_dp->regs.dp_tp_ctl);
 
        intel_dp->DP |= DDI_BUF_CTL_ENABLE;
        I915_WRITE(DDI_BUF_CTL(port), intel_dp->DP);
@@ -3891,6 +4184,23 @@ void intel_ddi_get_config(struct intel_encoder *encoder,
                pipe_config->lane_count =
                        ((temp & DDI_PORT_WIDTH_MASK) >> DDI_PORT_WIDTH_SHIFT) + 1;
                intel_dp_get_m_n(intel_crtc, pipe_config);
+
+               if (INTEL_GEN(dev_priv) >= 11) {
+                       i915_reg_t dp_tp_ctl;
+
+                       if (IS_GEN(dev_priv, 11))
+                               dp_tp_ctl = DP_TP_CTL(encoder->port);
+                       else
+                               dp_tp_ctl = TGL_DP_TP_CTL(pipe_config->cpu_transcoder);
+
+                       pipe_config->fec_enable =
+                               I915_READ(dp_tp_ctl) & DP_TP_CTL_FEC_ENABLE;
+
+                       DRM_DEBUG_KMS("[ENCODER:%d:%s] Fec status: %u\n",
+                                     encoder->base.base.id, encoder->base.name,
+                                     pipe_config->fec_enable);
+               }
+
                break;
        case TRANS_DDI_MODE_SELECT_DP_MST:
                pipe_config->output_types |= BIT(INTEL_OUTPUT_DP_MST);