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 14fe987..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) {
@@ -2313,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);
@@ -2627,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;
@@ -2643,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(
@@ -2677,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(
@@ -2687,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 */
        }
@@ -2698,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;
@@ -2716,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;
@@ -2726,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);
        }
 }
 
@@ -2755,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;
@@ -2786,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))
@@ -3037,8 +3150,7 @@ 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);
+       enum tc_port tc_port = intel_port_to_tc(dev_priv, dig_port->base.port);
        u32 val, bits;
        int ln;
 
@@ -3050,86 +3162,125 @@ icl_phy_set_clock_gating(struct intel_digital_port *dig_port, bool enable)
               MG_DP_MODE_CFG_GAONPWR_GATING;
 
        for (ln = 0; ln < 2; ln++) {
-               val = I915_READ(MG_DP_MODE(ln, port));
+               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 (enable)
                        val |= bits;
                else
                        val &= ~bits;
-               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);
        }
 
-       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;
+       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);
+               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,
@@ -3218,7 +3369,7 @@ static void tgl_ddi_pre_enable_dp(struct intel_encoder *encoder,
                                        dig_port->ddi_io_power_domain);
 
        /* 6. */
-       icl_program_mg_dp_mode(dig_port);
+       icl_program_mg_dp_mode(dig_port, crtc_state);
 
        /*
         * 7.a - Steps in this function should only be executed over MST
@@ -3234,7 +3385,7 @@ static void tgl_ddi_pre_enable_dp(struct intel_encoder *encoder,
        icl_phy_set_clock_gating(dig_port, false);
 
        /* 7.e */
-       icl_ddi_vswing_sequence(encoder, crtc_state->port_clock, level,
+       tgl_ddi_vswing_sequence(encoder, crtc_state->port_clock, level,
                                encoder->type);
 
        /* 7.f */
@@ -3266,6 +3417,15 @@ static void tgl_ddi_pre_enable_dp(struct intel_encoder *encoder,
        /* 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);
@@ -3300,7 +3460,7 @@ static void hsw_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_program_mg_dp_mode(dig_port, crtc_state);
        icl_phy_set_clock_gating(dig_port, false);
 
        if (INTEL_GEN(dev_priv) >= 11)
@@ -3370,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_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))