Skip to content

L
linux
Commit eee3f911 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files
Options

drm/i915: Introduce .set_link_train() vfunc 

Sort out some of the mess between intel_ddi.c intel_dp.c by
introducing a .set_link_train() vfunc.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200420200610.31798-1-ville.syrjala@linux.intel.comReviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
parent d7ff281c
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 81 deletions
drivers/gpu/drm/i915/display/intel_ddi.c
View file @ eee3f911
...@@ -3950,6 +3950,46 @@ static void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp) ...@@ -3950,6 +3950,46 @@ static void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)
udelay(600); udelay(600);
} }
static void intel_ddi_set_link_train(struct intel_dp *intel_dp,
u8 dp_train_pat)
{
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
u8 train_pat_mask = drm_dp_training_pattern_mask(intel_dp->dpcd);
enum port port = dp_to_dig_port(intel_dp)->base.port;
u32 temp;
temp = intel_de_read(dev_priv, intel_dp->regs.dp_tp_ctl);
if (dp_train_pat & DP_LINK_SCRAMBLING_DISABLE)
temp |= DP_TP_CTL_SCRAMBLE_DISABLE;
else
temp &= ~DP_TP_CTL_SCRAMBLE_DISABLE;
temp &= ~DP_TP_CTL_LINK_TRAIN_MASK;
switch (dp_train_pat & train_pat_mask) {
case DP_TRAINING_PATTERN_DISABLE:
temp |= DP_TP_CTL_LINK_TRAIN_NORMAL;
break;
case DP_TRAINING_PATTERN_1:
temp |= DP_TP_CTL_LINK_TRAIN_PAT1;
break;
case DP_TRAINING_PATTERN_2:
temp |= DP_TP_CTL_LINK_TRAIN_PAT2;
break;
case DP_TRAINING_PATTERN_3:
temp |= DP_TP_CTL_LINK_TRAIN_PAT3;
break;
case DP_TRAINING_PATTERN_4:
temp |= DP_TP_CTL_LINK_TRAIN_PAT4;
break;
}
intel_de_write(dev_priv, intel_dp->regs.dp_tp_ctl, temp);
intel_de_write(dev_priv, DDI_BUF_CTL(port), intel_dp->DP);
intel_de_posting_read(dev_priv, DDI_BUF_CTL(port));
}
static bool intel_ddi_is_audio_enabled(struct drm_i915_private *dev_priv, static bool intel_ddi_is_audio_enabled(struct drm_i915_private *dev_priv,
enum transcoder cpu_transcoder) enum transcoder cpu_transcoder)
{ {
...@@ -4394,6 +4434,8 @@ intel_ddi_init_dp_connector(struct intel_digital_port *intel_dig_port) ...@@ -4394,6 +4434,8 @@ intel_ddi_init_dp_connector(struct intel_digital_port *intel_dig_port)
intel_dig_port->dp.output_reg = DDI_BUF_CTL(port); intel_dig_port->dp.output_reg = DDI_BUF_CTL(port);
intel_dig_port->dp.prepare_link_retrain = intel_dig_port->dp.prepare_link_retrain =
intel_ddi_prepare_link_retrain; intel_ddi_prepare_link_retrain;
intel_dig_port->dp.set_link_train = intel_ddi_set_link_train;
if (INTEL_GEN(dev_priv) < 12) { if (INTEL_GEN(dev_priv) < 12) {
intel_dig_port->dp.regs.dp_tp_ctl = DP_TP_CTL(port); intel_dig_port->dp.regs.dp_tp_ctl = DP_TP_CTL(port);
intel_dig_port->dp.regs.dp_tp_status = DP_TP_STATUS(port); intel_dig_port->dp.regs.dp_tp_status = DP_TP_STATUS(port);
......
drivers/gpu/drm/i915/display/intel_display_types.h
View file @ eee3f911
...@@ -1367,6 +1367,7 @@ struct intel_dp { ...@@ -1367,6 +1367,7 @@ struct intel_dp {
/* This is called before a link training is starterd */ /* This is called before a link training is starterd */
void (*prepare_link_retrain)(struct intel_dp *intel_dp); void (*prepare_link_retrain)(struct intel_dp *intel_dp);
void (*set_link_train)(struct intel_dp *intel_dp, u8 dp_train_pat);
/* Displayport compliance testing */ /* Displayport compliance testing */
struct intel_dp_compliance compliance; struct intel_dp_compliance compliance;
......
drivers/gpu/drm/i915/display/intel_dp.c
View file @ eee3f911
...@@ -3618,90 +3618,63 @@ static void chv_post_disable_dp(struct intel_atomic_state *state, ...@@ -3618,90 +3618,63 @@ static void chv_post_disable_dp(struct intel_atomic_state *state,
} }
static void static void
_intel_dp_set_link_train(struct intel_dp *intel_dp, cpt_set_link_train(struct intel_dp *intel_dp,
u32 *DP, u8 dp_train_pat)
u8 dp_train_pat)
{ {
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); u32 *DP = &intel_dp->DP;
enum port port = intel_dig_port->base.port;
u8 train_pat_mask = drm_dp_training_pattern_mask(intel_dp->dpcd);
if (dp_train_pat & train_pat_mask)
drm_dbg_kms(&dev_priv->drm,
"Using DP training pattern TPS%d\n",
dp_train_pat & train_pat_mask);
if (HAS_DDI(dev_priv)) { *DP &= ~DP_LINK_TRAIN_MASK_CPT;
u32 temp = intel_de_read(dev_priv, intel_dp->regs.dp_tp_ctl);
if (dp_train_pat & DP_LINK_SCRAMBLING_DISABLE)
temp |= DP_TP_CTL_SCRAMBLE_DISABLE;
else
temp &= ~DP_TP_CTL_SCRAMBLE_DISABLE;
temp &= ~DP_TP_CTL_LINK_TRAIN_MASK;
switch (dp_train_pat & train_pat_mask) {
case DP_TRAINING_PATTERN_DISABLE:
temp |= DP_TP_CTL_LINK_TRAIN_NORMAL;
break; switch (dp_train_pat & DP_TRAINING_PATTERN_MASK) {
case DP_TRAINING_PATTERN_1: case DP_TRAINING_PATTERN_DISABLE:
temp |= DP_TP_CTL_LINK_TRAIN_PAT1; *DP |= DP_LINK_TRAIN_OFF_CPT;
break; break;
case DP_TRAINING_PATTERN_2: case DP_TRAINING_PATTERN_1:
temp |= DP_TP_CTL_LINK_TRAIN_PAT2; *DP |= DP_LINK_TRAIN_PAT_1_CPT;
break; break;
case DP_TRAINING_PATTERN_3: case DP_TRAINING_PATTERN_2:
temp |= DP_TP_CTL_LINK_TRAIN_PAT3; *DP |= DP_LINK_TRAIN_PAT_2_CPT;
break; break;
case DP_TRAINING_PATTERN_4: case DP_TRAINING_PATTERN_3:
temp |= DP_TP_CTL_LINK_TRAIN_PAT4; drm_dbg_kms(&dev_priv->drm,
break; "TPS3 not supported, using TPS2 instead\n");
} *DP |= DP_LINK_TRAIN_PAT_2_CPT;
intel_de_write(dev_priv, intel_dp->regs.dp_tp_ctl, temp); break;
}
} else if ((IS_IVYBRIDGE(dev_priv) && port == PORT_A) || intel_de_write(dev_priv, intel_dp->output_reg, intel_dp->DP);
(HAS_PCH_CPT(dev_priv) && port != PORT_A)) { intel_de_posting_read(dev_priv, intel_dp->output_reg);
*DP &= ~DP_LINK_TRAIN_MASK_CPT; }
switch (dp_train_pat & DP_TRAINING_PATTERN_MASK) { static void
case DP_TRAINING_PATTERN_DISABLE: g4x_set_link_train(struct intel_dp *intel_dp,
*DP |= DP_LINK_TRAIN_OFF_CPT; u8 dp_train_pat)
break; {
case DP_TRAINING_PATTERN_1: struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
*DP |= DP_LINK_TRAIN_PAT_1_CPT; u32 *DP = &intel_dp->DP;
break;
case DP_TRAINING_PATTERN_2:
*DP |= DP_LINK_TRAIN_PAT_2_CPT;
break;
case DP_TRAINING_PATTERN_3:
drm_dbg_kms(&dev_priv->drm,
"TPS3 not supported, using TPS2 instead\n");
*DP |= DP_LINK_TRAIN_PAT_2_CPT;
break;
}
} else { *DP &= ~DP_LINK_TRAIN_MASK;
*DP &= ~DP_LINK_TRAIN_MASK;
switch (dp_train_pat & DP_TRAINING_PATTERN_MASK) { switch (dp_train_pat & DP_TRAINING_PATTERN_MASK) {
case DP_TRAINING_PATTERN_DISABLE: case DP_TRAINING_PATTERN_DISABLE:
*DP |= DP_LINK_TRAIN_OFF; *DP |= DP_LINK_TRAIN_OFF;
break; break;
case DP_TRAINING_PATTERN_1: case DP_TRAINING_PATTERN_1:
*DP |= DP_LINK_TRAIN_PAT_1; *DP |= DP_LINK_TRAIN_PAT_1;
break; break;
case DP_TRAINING_PATTERN_2: case DP_TRAINING_PATTERN_2:
*DP |= DP_LINK_TRAIN_PAT_2; *DP |= DP_LINK_TRAIN_PAT_2;
break; break;
case DP_TRAINING_PATTERN_3: case DP_TRAINING_PATTERN_3:
drm_dbg_kms(&dev_priv->drm, drm_dbg_kms(&dev_priv->drm,
"TPS3 not supported, using TPS2 instead\n"); "TPS3 not supported, using TPS2 instead\n");
*DP |= DP_LINK_TRAIN_PAT_2; *DP |= DP_LINK_TRAIN_PAT_2;
break; break;
}
} }
intel_de_write(dev_priv, intel_dp->output_reg, intel_dp->DP);
intel_de_posting_read(dev_priv, intel_dp->output_reg);
} }
static void intel_dp_enable_port(struct intel_dp *intel_dp, static void intel_dp_enable_port(struct intel_dp *intel_dp,
...@@ -4358,14 +4331,15 @@ void ...@@ -4358,14 +4331,15 @@ void
intel_dp_program_link_training_pattern(struct intel_dp *intel_dp, intel_dp_program_link_training_pattern(struct intel_dp *intel_dp,
u8 dp_train_pat) u8 dp_train_pat)
{ {
struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
struct drm_i915_private *dev_priv = u8 train_pat_mask = drm_dp_training_pattern_mask(intel_dp->dpcd);
to_i915(intel_dig_port->base.base.dev);
_intel_dp_set_link_train(intel_dp, &intel_dp->DP, dp_train_pat); if (dp_train_pat & train_pat_mask)
drm_dbg_kms(&dev_priv->drm,
"Using DP training pattern TPS%d\n",
dp_train_pat & train_pat_mask);
intel_de_write(dev_priv, intel_dp->output_reg, intel_dp->DP); intel_dp->set_link_train(intel_dp, dp_train_pat);
intel_de_posting_read(dev_priv, intel_dp->output_reg);
} }
void intel_dp_set_idle_link_train(struct intel_dp *intel_dp) void intel_dp_set_idle_link_train(struct intel_dp *intel_dp)
...@@ -8515,6 +8489,12 @@ bool intel_dp_init(struct drm_i915_private *dev_priv, ...@@ -8515,6 +8489,12 @@ bool intel_dp_init(struct drm_i915_private *dev_priv,
intel_encoder->post_disable = g4x_post_disable_dp; intel_encoder->post_disable = g4x_post_disable_dp;
} }
if ((IS_IVYBRIDGE(dev_priv) && port == PORT_A) ||
(HAS_PCH_CPT(dev_priv) && port != PORT_A))
intel_dig_port->dp.set_link_train = cpt_set_link_train;
else
intel_dig_port->dp.set_link_train = g4x_set_link_train;
intel_dig_port->dp.output_reg = output_reg; intel_dig_port->dp.output_reg = output_reg;
intel_dig_port->max_lanes = 4; intel_dig_port->max_lanes = 4;
intel_dig_port->dp.regs.dp_tp_ctl = DP_TP_CTL(port); intel_dig_port->dp.regs.dp_tp_ctl = DP_TP_CTL(port);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7