On Mon, Dec 03, 2018 at 11:34:16AM -0800, Clint Taylor wrote:
>
>
> On 12/03/2018 04:19 AM, Ville Syrjälä wrote:
> > On Fri, Nov 30, 2018 at 02:58:01PM -0800, clinton.a.taylor@xxxxxxxxx wrote:
> >> From: Clint Taylor <clinton.a.taylor@xxxxxxxxx>
> >>
> >> In August 2018 the BSPEC changed the ICL port programming sequence to
> >> closely resemble earlier gen programming sequence.
> >>
> >> BSpec: 21257
> >> Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> >> Cc: Imre Deak <imre.deak@xxxxxxxxx>
> >> Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
> >> Signed-off-by: Clint Taylor <clinton.a.taylor@xxxxxxxxx>
> >> ---
> >> drivers/gpu/drm/i915/i915_reg.h | 4 +
> >> drivers/gpu/drm/i915/intel_ddi.c | 223 +++++++++++++----------------------
> >> drivers/gpu/drm/i915/intel_display.c | 3 -
> >> 3 files changed, 86 insertions(+), 144 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> >> index d3ef979..e632e99 100644
> >> --- a/drivers/gpu/drm/i915/i915_reg.h
> >> +++ b/drivers/gpu/drm/i915/i915_reg.h
> >> @@ -1866,6 +1866,10 @@ enum i915_power_well_id {
> >>
> >> #define CNL_PORT_TX_DW7_GRP(port) _MMIO(_CNL_PORT_TX_DW_GRP((port), 7))
> >> #define CNL_PORT_TX_DW7_LN0(port) _MMIO(_CNL_PORT_TX_DW_LN0((port), 7))
> >> +#define ICL_PORT_TX_DW7_AUX(port) _MMIO(_ICL_PORT_TX_DW_AUX(7, port))
> >> +#define ICL_PORT_TX_DW7_GRP(port) _MMIO(_ICL_PORT_TX_DW_GRP(7, port))
> >> +#define ICL_PORT_TX_DW7_LN0(port) _MMIO(_ICL_PORT_TX_DW_LN(7, 0, port))
> >> +#define ICL_PORT_TX_DW7_LN(port, ln) _MMIO(_ICL_PORT_TX_DW_LN(7, ln, port))
> >> #define N_SCALAR(x) ((x) << 24)
> >> #define N_SCALAR_MASK (0x7F << 24)
> >>
> >> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> >> index 61d7145..219464e9 100644
> >> --- a/drivers/gpu/drm/i915/intel_ddi.c
> >> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> >> @@ -493,103 +493,63 @@ struct cnl_ddi_buf_trans {
> >> { 0x2, 0x7F, 0x3F, 0x00, 0x00 }, /* 400 400 0.0 */
> >> };
> >>
> >> -struct icl_combo_phy_ddi_buf_trans {
> >> - u32 dw2_swing_select;
> >> - u32 dw2_swing_scalar;
> >> - u32 dw4_scaling;
> >> -};
> >> -
> >> -/* Voltage Swing Programming for VccIO 0.85V for DP */
> >> -static const struct icl_combo_phy_ddi_buf_trans icl_combo_phy_ddi_translations_dp_hdmi_0_85V[] = {
> >> - /* Voltage mV db */
> >> - { 0x2, 0x98, 0x0018 }, /* 400 0.0 */
> >> - { 0x2, 0x98, 0x3015 }, /* 400 3.5 */
> >> - { 0x2, 0x98, 0x6012 }, /* 400 6.0 */
> >> - { 0x2, 0x98, 0x900F }, /* 400 9.5 */
> >> - { 0xB, 0x70, 0x0018 }, /* 600 0.0 */
> >> - { 0xB, 0x70, 0x3015 }, /* 600 3.5 */
> >> - { 0xB, 0x70, 0x6012 }, /* 600 6.0 */
> >> - { 0x5, 0x00, 0x0018 }, /* 800 0.0 */
> >> - { 0x5, 0x00, 0x3015 }, /* 800 3.5 */
> >> - { 0x6, 0x98, 0x0018 }, /* 1200 0.0 */
> >> -};
> >> -
> >> -/* FIXME - After table is updated in Bspec */
> >> -/* Voltage Swing Programming for VccIO 0.85V for eDP */
> >> -static const struct icl_combo_phy_ddi_buf_trans icl_combo_phy_ddi_translations_edp_0_85V[] = {
> >> - /* Voltage mV db */
> >> - { 0x0, 0x00, 0x00 }, /* 200 0.0 */
> >> - { 0x0, 0x00, 0x00 }, /* 200 1.5 */
> >> - { 0x0, 0x00, 0x00 }, /* 200 4.0 */
> >> - { 0x0, 0x00, 0x00 }, /* 200 6.0 */
> >> - { 0x0, 0x00, 0x00 }, /* 250 0.0 */
> >> - { 0x0, 0x00, 0x00 }, /* 250 1.5 */
> >> - { 0x0, 0x00, 0x00 }, /* 250 4.0 */
> >> - { 0x0, 0x00, 0x00 }, /* 300 0.0 */
> >> - { 0x0, 0x00, 0x00 }, /* 300 1.5 */
> >> - { 0x0, 0x00, 0x00 }, /* 350 0.0 */
> >> +/* icl_combo_phy_ddi_translations */
> >> +static const struct cnl_ddi_buf_trans icl_combo_phy_ddi_translations_dp[] = {
> >> + /* NT mV Trans mV db */
> >> + { 0xA, 0x35, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */
> >> + { 0xA, 0x4F, 0x37, 0x00, 0x08 }, /* 350 500 3.1 */
> >> + { 0xC, 0x71, 0x2F, 0x00, 0x10 }, /* 350 700 6.0 */
> >> + { 0x6, 0x7F, 0x2B, 0x00, 0x14 }, /* 350 900 8.2 */
> >> + { 0xA, 0x4C, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */
> >> + { 0xC, 0x73, 0x34, 0x00, 0x0B }, /* 500 700 2.9 */
> >> + { 0x6, 0x7F, 0x2F, 0x00, 0x10 }, /* 500 900 5.1 */
> >> + { 0xC, 0x6C, 0x3C, 0x00, 0x03 }, /* 650 705 0.6 */
> >> + { 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 900 3.5 */
> >> + { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */
> >> };
> >>
> >> -/* Voltage Swing Programming for VccIO 0.95V for DP */
> >> -static const struct icl_combo_phy_ddi_buf_trans icl_combo_phy_ddi_translations_dp_hdmi_0_95V[] = {
> >> - /* Voltage mV db */
> >> - { 0x2, 0x98, 0x0018 }, /* 400 0.0 */
> >> - { 0x2, 0x98, 0x3015 }, /* 400 3.5 */
> >> - { 0x2, 0x98, 0x6012 }, /* 400 6.0 */
> >> - { 0x2, 0x98, 0x900F }, /* 400 9.5 */
> >> - { 0x4, 0x98, 0x0018 }, /* 600 0.0 */
> >> - { 0x4, 0x98, 0x3015 }, /* 600 3.5 */
> >> - { 0x4, 0x98, 0x6012 }, /* 600 6.0 */
> >> - { 0x5, 0x76, 0x0018 }, /* 800 0.0 */
> >> - { 0x5, 0x76, 0x3015 }, /* 800 3.5 */
> >> - { 0x6, 0x98, 0x0018 }, /* 1200 0.0 */
> >> +static const struct cnl_ddi_buf_trans icl_combo_phy_ddi_translations_edp_lowswing[] = {
> >> + /* NT mV Trans mV db */
> >> + { 0x0, 0x7F, 0x3F, 0x00, 0x00 }, /* 200 200 0.0 */
> >> + { 0x8, 0x7F, 0x38, 0x00, 0x07 }, /* 200 250 1.9 */
> >> + { 0x1, 0x7F, 0x33, 0x00, 0x0C }, /* 200 300 3.5 */
> >> + { 0x9, 0x7F, 0x31, 0x00, 0x0E }, /* 200 350 4.9 */
> >> + { 0x8, 0x7F, 0x3F, 0x00, 0x00 }, /* 250 250 0.0 */
> >> + { 0x1, 0x7F, 0x38, 0x00, 0x07 }, /* 250 300 1.6 */
> >> + { 0x9, 0x7F, 0x35, 0x00, 0x0A }, /* 250 350 2.9 */
> >> + { 0x1, 0x7F, 0x3F, 0x00, 0x00 }, /* 300 300 0.0 */
> >> + { 0x9, 0x7F, 0x38, 0x00, 0x07 }, /* 300 350 1.3 */
> >> + { 0x9, 0x7F, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */
> >> };
> >>
> >> -/* FIXME - After table is updated in Bspec */
> >> -/* Voltage Swing Programming for VccIO 0.95V for eDP */
> >> -static const struct icl_combo_phy_ddi_buf_trans icl_combo_phy_ddi_translations_edp_0_95V[] = {
> >> - /* Voltage mV db */
> >> - { 0x0, 0x00, 0x00 }, /* 200 0.0 */
> >> - { 0x0, 0x00, 0x00 }, /* 200 1.5 */
> >> - { 0x0, 0x00, 0x00 }, /* 200 4.0 */
> >> - { 0x0, 0x00, 0x00 }, /* 200 6.0 */
> >> - { 0x0, 0x00, 0x00 }, /* 250 0.0 */
> >> - { 0x0, 0x00, 0x00 }, /* 250 1.5 */
> >> - { 0x0, 0x00, 0x00 }, /* 250 4.0 */
> >> - { 0x0, 0x00, 0x00 }, /* 300 0.0 */
> >> - { 0x0, 0x00, 0x00 }, /* 300 1.5 */
> >> - { 0x0, 0x00, 0x00 }, /* 350 0.0 */
> >> +static const struct cnl_ddi_buf_trans icl_combo_phy_ddi_translations_edp_hbr3[] = {
> >> + /* NT mV Trans mV db */
> >> + { 0xA, 0x35, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */
> >> + { 0xA, 0x4F, 0x37, 0x00, 0x08 }, /* 350 500 3.1 */
> >> + { 0xC, 0x71, 0x2F, 0x00, 0x10 }, /* 350 700 6.0 */
> >> + { 0x6, 0x7F, 0x2B, 0x00, 0x14 }, /* 350 900 8.2 */
> >> + { 0xA, 0x4C, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */
> >> + { 0xC, 0x73, 0x34, 0x00, 0x0B }, /* 500 700 2.9 */
> >> + { 0x6, 0x7F, 0x2F, 0x00, 0x10 }, /* 500 900 5.1 */
> >> + { 0xC, 0x6C, 0x3C, 0x00, 0x03 }, /* 650 700 0.6 */
> >> + { 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 900 3.5 */
> >> + { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */
> >> };
> >>
> >> -/* Voltage Swing Programming for VccIO 1.05V for DP */
> >> -static const struct icl_combo_phy_ddi_buf_trans icl_combo_phy_ddi_translations_dp_hdmi_1_05V[] = {
> >> - /* Voltage mV db */
> >> - { 0x2, 0x98, 0x0018 }, /* 400 0.0 */
> >> - { 0x2, 0x98, 0x3015 }, /* 400 3.5 */
> >> - { 0x2, 0x98, 0x6012 }, /* 400 6.0 */
> >> - { 0x2, 0x98, 0x900F }, /* 400 9.5 */
> >> - { 0x4, 0x98, 0x0018 }, /* 600 0.0 */
> >> - { 0x4, 0x98, 0x3015 }, /* 600 3.5 */
> >> - { 0x4, 0x98, 0x6012 }, /* 600 6.0 */
> >> - { 0x5, 0x71, 0x0018 }, /* 800 0.0 */
> >> - { 0x5, 0x71, 0x3015 }, /* 800 3.5 */
> >> - { 0x6, 0x98, 0x0018 }, /* 1200 0.0 */
> >> +static const struct cnl_ddi_buf_trans icl_combo_phy_ddi_translations_hdmi[] = {
> >> + /* NT mV Trans mV db */
> >> + { 0xA, 0x60, 0x3F, 0x00, 0x00 }, /* 450 450 0.0 */
> >> + { 0xB, 0x73, 0x36, 0x00, 0x09 }, /* 450 650 3.2 */
> >> + { 0x6, 0x7F, 0x31, 0x00, 0x0E }, /* 450 850 5.5 */
> >> + { 0xB, 0x73, 0x3F, 0x00, 0x00 }, /* 650 650 0.0 ALS */
> >> + { 0x6, 0x7F, 0x37, 0x00, 0x08 }, /* 650 850 2.3 */
> >> + { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 850 850 0.0 */
> >> + { 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 850 3.0 */
> >> };
> >>
> >> -/* FIXME - After table is updated in Bspec */
> >> -/* Voltage Swing Programming for VccIO 1.05V for eDP */
> >> -static const struct icl_combo_phy_ddi_buf_trans icl_combo_phy_ddi_translations_edp_1_05V[] = {
> >> - /* Voltage mV db */
> >> - { 0x0, 0x00, 0x00 }, /* 200 0.0 */
> >> - { 0x0, 0x00, 0x00 }, /* 200 1.5 */
> >> - { 0x0, 0x00, 0x00 }, /* 200 4.0 */
> >> - { 0x0, 0x00, 0x00 }, /* 200 6.0 */
> >> - { 0x0, 0x00, 0x00 }, /* 250 0.0 */
> >> - { 0x0, 0x00, 0x00 }, /* 250 1.5 */
> >> - { 0x0, 0x00, 0x00 }, /* 250 4.0 */
> >> - { 0x0, 0x00, 0x00 }, /* 300 0.0 */
> >> - { 0x0, 0x00, 0x00 }, /* 300 1.5 */
> >> - { 0x0, 0x00, 0x00 }, /* 350 0.0 */
> >> +static const struct cnl_ddi_buf_trans icl_combo_phy_ddi_translations_mipi[] = {
> >> + /* NT mV Trans mV db */
> >> + { 0x2, 0x7F, 0x3F, 0x00, 0x00 }, /* 400 400 0.0 */
> >> };
> >>
> >> struct icl_mg_phy_ddi_buf_trans {
> >> @@ -870,43 +830,27 @@ static int skl_buf_trans_num_entries(enum port port, int n_entries)
> >> }
> >> }
> >>
> >> -static const struct icl_combo_phy_ddi_buf_trans *
> >> +static const struct cnl_ddi_buf_trans *
> >> icl_get_combo_buf_trans(struct drm_i915_private *dev_priv, enum port port,
> >> int type, int *n_entries)
> >> {
> >> - u32 voltage = I915_READ(ICL_PORT_COMP_DW3(port)) & VOLTAGE_INFO_MASK;
> >>
> >> if (type == INTEL_OUTPUT_EDP && dev_priv->vbt.edp.low_vswing) {
> >> - switch (voltage) {
> >> - case VOLTAGE_INFO_0_85V:
> >> - *n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_0_85V);
> >> - return icl_combo_phy_ddi_translations_edp_0_85V;
> >> - case VOLTAGE_INFO_0_95V:
> >> - *n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_0_95V);
> >> - return icl_combo_phy_ddi_translations_edp_0_95V;
> >> - case VOLTAGE_INFO_1_05V:
> >> - *n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_1_05V);
> >> - return icl_combo_phy_ddi_translations_edp_1_05V;
> >> - default:
> >> - MISSING_CASE(voltage);
> >> - return NULL;
> >> - }
> >> - } else {
> >> - switch (voltage) {
> >> - case VOLTAGE_INFO_0_85V:
> >> - *n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_dp_hdmi_0_85V);
> >> - return icl_combo_phy_ddi_translations_dp_hdmi_0_85V;
> >> - case VOLTAGE_INFO_0_95V:
> >> - *n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_dp_hdmi_0_95V);
> >> - return icl_combo_phy_ddi_translations_dp_hdmi_0_95V;
> >> - case VOLTAGE_INFO_1_05V:
> >> - *n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_dp_hdmi_1_05V);
> >> - return icl_combo_phy_ddi_translations_dp_hdmi_1_05V;
> >> - default:
> >> - MISSING_CASE(voltage);
> >> - return NULL;
> >> - }
> >> + *n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_lowswing);
> >> + return icl_combo_phy_ddi_translations_edp_lowswing;
> >> + } else if (type == INTEL_OUTPUT_EDP) {
> >> + *n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_hbr3);
> >> + return icl_combo_phy_ddi_translations_edp_hbr3;
> >> + } else if ((type == INTEL_OUTPUT_DP) || (type == INTEL_OUTPUT_DDI) ||
> >> + (type == INTEL_OUTPUT_DP_MST)) {
> > I would move the hdmi case first to match how most other platforms do
> > it, and to eliminate this complicated DP check.
> Agreed.
> >
> >> + *n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_dp);
> >> + return icl_combo_phy_ddi_translations_dp;
> >> + } else if (type == INTEL_OUTPUT_HDMI) {
> >> + *n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_hdmi);
> >> + return icl_combo_phy_ddi_translations_hdmi;
> >> }
> >> +
> >> + return NULL;
> >> }
> >>
> >> static int intel_ddi_hdmi_level(struct drm_i915_private *dev_priv, enum port port)
> >> @@ -2463,7 +2407,7 @@ static void cnl_ddi_vswing_sequence(struct intel_encoder *encoder,
> >> static void icl_ddi_combo_vswing_program(struct drm_i915_private *dev_priv,
> >> u32 level, enum port port, int type)
> >> {
> >> - const struct icl_combo_phy_ddi_buf_trans *ddi_translations = NULL;
> >> + const struct cnl_ddi_buf_trans *ddi_translations = NULL;
> >> u32 n_entries, val;
> >> int ln;
> >>
> >> @@ -2477,34 +2421,23 @@ static void icl_ddi_combo_vswing_program(struct drm_i915_private *dev_priv,
> >> level = n_entries - 1;
> >> }
> >>
> >> - /* Set PORT_TX_DW5 Rterm Sel to 110b. */
> >> + /* Set PORT_TX_DW5 */
> >> val = I915_READ(ICL_PORT_TX_DW5_LN0(port));
> >> - val &= ~RTERM_SELECT_MASK;
> >> + val &= ~(SCALING_MODE_SEL_MASK | RTERM_SELECT_MASK |
> >> + TAP2_DISABLE | TAP3_DISABLE);
> >> + val |= SCALING_MODE_SEL(0x2);
> >> val |= RTERM_SELECT(0x6);
> >> - I915_WRITE(ICL_PORT_TX_DW5_GRP(port), val);
> >> -
> >> - /* Program PORT_TX_DW5 */
> >> - val = I915_READ(ICL_PORT_TX_DW5_LN0(port));
> >> - /* Set DisableTap2 and DisableTap3 if MIPI DSI
> >> - * Clear DisableTap2 and DisableTap3 for all other Ports
> >> - */
> >> - if (type == INTEL_OUTPUT_DSI) {
> >> - val |= TAP2_DISABLE;
> >> - val |= TAP3_DISABLE;
> >> - } else {
> >> - val &= ~TAP2_DISABLE;
> >> - val &= ~TAP3_DISABLE;
> >> - }
> >> + val |= TAP3_DISABLE;
> >> I915_WRITE(ICL_PORT_TX_DW5_GRP(port), val);
> >>
> >> /* Program PORT_TX_DW2 */
> >> val = I915_READ(ICL_PORT_TX_DW2_LN0(port));
> >> val &= ~(SWING_SEL_LOWER_MASK | SWING_SEL_UPPER_MASK |
> >> RCOMP_SCALAR_MASK);
> >> - val |= SWING_SEL_UPPER(ddi_translations[level].dw2_swing_select);
> >> - val |= SWING_SEL_LOWER(ddi_translations[level].dw2_swing_select);
> >> + val |= SWING_SEL_UPPER(ddi_translations[level].dw2_swing_sel);
> >> + val |= SWING_SEL_LOWER(ddi_translations[level].dw2_swing_sel);
> >> /* Program Rcomp scalar for every table entry */
> >> - val |= RCOMP_SCALAR(ddi_translations[level].dw2_swing_scalar);
> >> + val |= RCOMP_SCALAR(0x98);
> >> I915_WRITE(ICL_PORT_TX_DW2_GRP(port), val);
> >>
> >> /* Program PORT_TX_DW4 */
> >> @@ -2513,9 +2446,17 @@ static void icl_ddi_combo_vswing_program(struct drm_i915_private *dev_priv,
> >> val = I915_READ(ICL_PORT_TX_DW4_LN(port, ln));
> >> val &= ~(POST_CURSOR_1_MASK | POST_CURSOR_2_MASK |
> >> CURSOR_COEFF_MASK);
> >> - val |= ddi_translations[level].dw4_scaling;
> >> + val |= POST_CURSOR_1(ddi_translations[level].dw4_post_cursor_1);
> >> + val |= POST_CURSOR_2(ddi_translations[level].dw4_post_cursor_2);
> >> + val |= CURSOR_COEFF(ddi_translations[level].dw4_cursor_coeff);
> >> I915_WRITE(ICL_PORT_TX_DW4_LN(port, ln), val);
> >> }
> >> +
> >> + /* Program PORT_TX_DW7 */
> > The comment is redundant.
> It's consistent with the other comments in the function. The CNL
> function also has the exact same comment. Are you sure you want me to
> remove this comment?
Meh. I guess keep it it it's consistent with the rest. Or send a patch
to nuke all the redundant comments.
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
