Skip to content

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

drm/i915: Use intel_de_rmw() for icl mg phy programming 

Streamline the code by using intel_de_rmw().
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211006204937.30774-15-ville.syrjala@linux.intel.comReviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
parent c86e1873
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 73 deletions
drivers/gpu/drm/i915/display/intel_ddi.c
View file @ d4e0f163
...@@ -1166,7 +1166,6 @@ static void icl_mg_phy_set_signal_levels(struct intel_encoder *encoder, ...@@ -1166,7 +1166,6 @@ static void icl_mg_phy_set_signal_levels(struct intel_encoder *encoder,
enum tc_port tc_port = intel_port_to_tc(dev_priv, encoder->port); enum tc_port tc_port = intel_port_to_tc(dev_priv, encoder->port);
const struct intel_ddi_buf_trans *trans; const struct intel_ddi_buf_trans *trans;
int n_entries, ln; int n_entries, ln;
u32 val;
if (intel_tc_port_in_tbt_alt_mode(enc_to_dig_port(encoder))) if (intel_tc_port_in_tbt_alt_mode(enc_to_dig_port(encoder)))
return; return;
...@@ -1175,15 +1174,11 @@ static void icl_mg_phy_set_signal_levels(struct intel_encoder *encoder, ...@@ -1175,15 +1174,11 @@ static void icl_mg_phy_set_signal_levels(struct intel_encoder *encoder,
if (drm_WARN_ON_ONCE(&dev_priv->drm, !trans)) if (drm_WARN_ON_ONCE(&dev_priv->drm, !trans))
return; return;
/* Set MG_TX_LINK_PARAMS cri_use_fs32 to 0. */
for (ln = 0; ln < 2; ln++) { for (ln = 0; ln < 2; ln++) {
val = intel_de_read(dev_priv, MG_TX1_LINK_PARAMS(ln, tc_port)); intel_de_rmw(dev_priv, MG_TX1_LINK_PARAMS(ln, tc_port),
val &= ~CRI_USE_FS32; CRI_USE_FS32, 0);
intel_de_write(dev_priv, MG_TX1_LINK_PARAMS(ln, tc_port), val); intel_de_rmw(dev_priv, MG_TX2_LINK_PARAMS(ln, tc_port),
CRI_USE_FS32, 0);
val = intel_de_read(dev_priv, MG_TX2_LINK_PARAMS(ln, tc_port));
val &= ~CRI_USE_FS32;
intel_de_write(dev_priv, MG_TX2_LINK_PARAMS(ln, tc_port), val);
} }
/* Program MG_TX_SWINGCTRL with values from vswing table */ /* Program MG_TX_SWINGCTRL with values from vswing table */
...@@ -1192,19 +1187,15 @@ static void icl_mg_phy_set_signal_levels(struct intel_encoder *encoder, ...@@ -1192,19 +1187,15 @@ static void icl_mg_phy_set_signal_levels(struct intel_encoder *encoder,
level = intel_ddi_level(encoder, crtc_state, 2*ln+0); level = intel_ddi_level(encoder, crtc_state, 2*ln+0);
val = intel_de_read(dev_priv, MG_TX1_SWINGCTRL(ln, tc_port)); intel_de_rmw(dev_priv, MG_TX1_SWINGCTRL(ln, tc_port),
val &= ~CRI_TXDEEMPH_OVERRIDE_17_12_MASK; CRI_TXDEEMPH_OVERRIDE_17_12_MASK,
val |= CRI_TXDEEMPH_OVERRIDE_17_12( CRI_TXDEEMPH_OVERRIDE_17_12(trans->entries[level].mg.cri_txdeemph_override_17_12));
trans->entries[level].mg.cri_txdeemph_override_17_12);
intel_de_write(dev_priv, MG_TX1_SWINGCTRL(ln, tc_port), val);
level = intel_ddi_level(encoder, crtc_state, 2*ln+1); level = intel_ddi_level(encoder, crtc_state, 2*ln+1);
val = intel_de_read(dev_priv, MG_TX2_SWINGCTRL(ln, tc_port)); intel_de_rmw(dev_priv, MG_TX2_SWINGCTRL(ln, tc_port),
val &= ~CRI_TXDEEMPH_OVERRIDE_17_12_MASK; CRI_TXDEEMPH_OVERRIDE_17_12_MASK,
val |= CRI_TXDEEMPH_OVERRIDE_17_12( CRI_TXDEEMPH_OVERRIDE_17_12(trans->entries[level].mg.cri_txdeemph_override_17_12));
trans->entries[level].mg.cri_txdeemph_override_17_12);
intel_de_write(dev_priv, MG_TX2_SWINGCTRL(ln, tc_port), val);
} }
/* Program MG_TX_DRVCTRL with values from vswing table */ /* Program MG_TX_DRVCTRL with values from vswing table */
...@@ -1213,27 +1204,21 @@ static void icl_mg_phy_set_signal_levels(struct intel_encoder *encoder, ...@@ -1213,27 +1204,21 @@ static void icl_mg_phy_set_signal_levels(struct intel_encoder *encoder,
level = intel_ddi_level(encoder, crtc_state, 2*ln+0); level = intel_ddi_level(encoder, crtc_state, 2*ln+0);
val = intel_de_read(dev_priv, MG_TX1_DRVCTRL(ln, tc_port)); intel_de_rmw(dev_priv, MG_TX1_DRVCTRL(ln, tc_port),
val &= ~(CRI_TXDEEMPH_OVERRIDE_11_6_MASK | CRI_TXDEEMPH_OVERRIDE_11_6_MASK |
CRI_TXDEEMPH_OVERRIDE_5_0_MASK); CRI_TXDEEMPH_OVERRIDE_5_0_MASK,
val |= CRI_TXDEEMPH_OVERRIDE_5_0( CRI_TXDEEMPH_OVERRIDE_11_6(trans->entries[level].mg.cri_txdeemph_override_11_6) |
trans->entries[level].mg.cri_txdeemph_override_5_0) | CRI_TXDEEMPH_OVERRIDE_5_0(trans->entries[level].mg.cri_txdeemph_override_5_0) |
CRI_TXDEEMPH_OVERRIDE_11_6( CRI_TXDEEMPH_OVERRIDE_EN);
trans->entries[level].mg.cri_txdeemph_override_11_6) |
CRI_TXDEEMPH_OVERRIDE_EN;
intel_de_write(dev_priv, MG_TX1_DRVCTRL(ln, tc_port), val);
level = intel_ddi_level(encoder, crtc_state, 2*ln+1); level = intel_ddi_level(encoder, crtc_state, 2*ln+1);
val = intel_de_read(dev_priv, MG_TX2_DRVCTRL(ln, tc_port)); intel_de_rmw(dev_priv, MG_TX2_DRVCTRL(ln, tc_port),
val &= ~(CRI_TXDEEMPH_OVERRIDE_11_6_MASK | CRI_TXDEEMPH_OVERRIDE_11_6_MASK |
CRI_TXDEEMPH_OVERRIDE_5_0_MASK); CRI_TXDEEMPH_OVERRIDE_5_0_MASK,
val |= CRI_TXDEEMPH_OVERRIDE_5_0( CRI_TXDEEMPH_OVERRIDE_11_6(trans->entries[level].mg.cri_txdeemph_override_11_6) |
trans->entries[level].mg.cri_txdeemph_override_5_0) | CRI_TXDEEMPH_OVERRIDE_5_0(trans->entries[level].mg.cri_txdeemph_override_5_0) |
CRI_TXDEEMPH_OVERRIDE_11_6( CRI_TXDEEMPH_OVERRIDE_EN);
trans->entries[level].mg.cri_txdeemph_override_11_6) |
CRI_TXDEEMPH_OVERRIDE_EN;
intel_de_write(dev_priv, MG_TX2_DRVCTRL(ln, tc_port), val);
/* FIXME: Program CRI_LOADGEN_SEL after the spec is updated */ /* FIXME: Program CRI_LOADGEN_SEL after the spec is updated */
} }
...@@ -1244,50 +1229,34 @@ static void icl_mg_phy_set_signal_levels(struct intel_encoder *encoder, ...@@ -1244,50 +1229,34 @@ static void icl_mg_phy_set_signal_levels(struct intel_encoder *encoder,
* values from table for which TX1 and TX2 enabled. * values from table for which TX1 and TX2 enabled.
*/ */
for (ln = 0; ln < 2; ln++) { for (ln = 0; ln < 2; ln++) {
val = intel_de_read(dev_priv, MG_CLKHUB(ln, tc_port)); intel_de_rmw(dev_priv, MG_CLKHUB(ln, tc_port),
if (crtc_state->port_clock < 300000) CFG_LOW_RATE_LKREN_EN,
val |= CFG_LOW_RATE_LKREN_EN; crtc_state->port_clock < 300000 ? CFG_LOW_RATE_LKREN_EN : 0);
else
val &= ~CFG_LOW_RATE_LKREN_EN;
intel_de_write(dev_priv, MG_CLKHUB(ln, tc_port), val);
} }
/* Program the MG_TX_DCC<LN, port being used> based on the link frequency */ /* Program the MG_TX_DCC<LN, port being used> based on the link frequency */
for (ln = 0; ln < 2; ln++) { for (ln = 0; ln < 2; ln++) {
val = intel_de_read(dev_priv, MG_TX1_DCC(ln, tc_port)); intel_de_rmw(dev_priv, MG_TX1_DCC(ln, tc_port),
val &= ~CFG_AMI_CK_DIV_OVERRIDE_VAL_MASK; CFG_AMI_CK_DIV_OVERRIDE_VAL_MASK |
if (crtc_state->port_clock <= 500000) { CFG_AMI_CK_DIV_OVERRIDE_EN,
val &= ~CFG_AMI_CK_DIV_OVERRIDE_EN; crtc_state->port_clock > 500000 ?
} else { CFG_AMI_CK_DIV_OVERRIDE_VAL(1) |
val |= CFG_AMI_CK_DIV_OVERRIDE_EN | CFG_AMI_CK_DIV_OVERRIDE_EN : 0);
CFG_AMI_CK_DIV_OVERRIDE_VAL(1);
} intel_de_rmw(dev_priv, MG_TX2_DCC(ln, tc_port),
intel_de_write(dev_priv, MG_TX1_DCC(ln, tc_port), val); CFG_AMI_CK_DIV_OVERRIDE_VAL_MASK |
CFG_AMI_CK_DIV_OVERRIDE_EN,
val = intel_de_read(dev_priv, MG_TX2_DCC(ln, tc_port)); crtc_state->port_clock > 500000 ?
val &= ~CFG_AMI_CK_DIV_OVERRIDE_VAL_MASK; CFG_AMI_CK_DIV_OVERRIDE_VAL(1) |
if (crtc_state->port_clock <= 500000) { CFG_AMI_CK_DIV_OVERRIDE_EN : 0);
val &= ~CFG_AMI_CK_DIV_OVERRIDE_EN;
} else {
val |= CFG_AMI_CK_DIV_OVERRIDE_EN |
CFG_AMI_CK_DIV_OVERRIDE_VAL(1);
}
intel_de_write(dev_priv, MG_TX2_DCC(ln, tc_port), val);
} }
/* Program MG_TX_PISO_READLOAD with values from vswing table */ /* Program MG_TX_PISO_READLOAD with values from vswing table */
for (ln = 0; ln < 2; ln++) { for (ln = 0; ln < 2; ln++) {
val = intel_de_read(dev_priv, intel_de_rmw(dev_priv, MG_TX1_PISO_READLOAD(ln, tc_port),
MG_TX1_PISO_READLOAD(ln, tc_port)); 0, CRI_CALCINIT);
val |= CRI_CALCINIT; intel_de_rmw(dev_priv, MG_TX2_PISO_READLOAD(ln, tc_port),
intel_de_write(dev_priv, MG_TX1_PISO_READLOAD(ln, tc_port), 0, CRI_CALCINIT);
val);
val = intel_de_read(dev_priv,
MG_TX2_PISO_READLOAD(ln, tc_port));
val |= CRI_CALCINIT;
intel_de_write(dev_priv, MG_TX2_PISO_READLOAD(ln, tc_port),
val);
} }
} }
......
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