iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Streamline the code by using intel_de_rmw().

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211006204937.30774-16-ville.syrjala@linux.intel.com
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
This commit is contained in:
Ville Syrjälä 2021-10-06 23:49:36 +03:00
parent d4e0f16325
commit c1d53cbd83
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/gpu/drm/i915/display/intel_ddi.c
View File

@ -1071,14 +1071,11 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder,
for (ln = 0; ln < 4; ln++) { for (ln = 0; ln < 4; ln++) {
int level = intel_ddi_level(encoder, crtc_state, ln); int level = intel_ddi_level(encoder, crtc_state, ln);
val = intel_de_read(dev_priv, ICL_PORT_TX_DW2_LN(ln, phy)); intel_de_rmw(dev_priv, ICL_PORT_TX_DW2_LN(ln, phy),
val &= ~(SWING_SEL_LOWER_MASK | SWING_SEL_UPPER_MASK | SWING_SEL_UPPER_MASK | SWING_SEL_LOWER_MASK | RCOMP_SCALAR_MASK,
RCOMP_SCALAR_MASK); SWING_SEL_UPPER(trans->entries[level].icl.dw2_swing_sel) |
val |= SWING_SEL_UPPER(trans->entries[level].icl.dw2_swing_sel); SWING_SEL_LOWER(trans->entries[level].icl.dw2_swing_sel) |
val |= SWING_SEL_LOWER(trans->entries[level].icl.dw2_swing_sel); RCOMP_SCALAR(0x98));
/* Program Rcomp scalar for every table entry */
val |= RCOMP_SCALAR(0x98);
intel_de_write(dev_priv, ICL_PORT_TX_DW2_LN(ln, phy), val);
} }
/* Program PORT_TX_DW4 */ /* Program PORT_TX_DW4 */
@ -1086,23 +1083,20 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder,
for (ln = 0; ln < 4; ln++) { for (ln = 0; ln < 4; ln++) {
int level = intel_ddi_level(encoder, crtc_state, ln); int level = intel_ddi_level(encoder, crtc_state, ln);
val = intel_de_read(dev_priv, ICL_PORT_TX_DW4_LN(ln, phy)); intel_de_rmw(dev_priv, ICL_PORT_TX_DW4_LN(ln, phy),
val &= ~(POST_CURSOR_1_MASK | POST_CURSOR_2_MASK | POST_CURSOR_1_MASK | POST_CURSOR_2_MASK | CURSOR_COEFF_MASK,
CURSOR_COEFF_MASK); POST_CURSOR_1(trans->entries[level].icl.dw4_post_cursor_1) |
val |= POST_CURSOR_1(trans->entries[level].icl.dw4_post_cursor_1); POST_CURSOR_2(trans->entries[level].icl.dw4_post_cursor_2) |
val |= POST_CURSOR_2(trans->entries[level].icl.dw4_post_cursor_2); CURSOR_COEFF(trans->entries[level].icl.dw4_cursor_coeff));
val |= CURSOR_COEFF(trans->entries[level].icl.dw4_cursor_coeff);
intel_de_write(dev_priv, ICL_PORT_TX_DW4_LN(ln, phy), val);
} }
/* Program PORT_TX_DW7 */ /* Program PORT_TX_DW7 */
for (ln = 0; ln < 4; ln++) { for (ln = 0; ln < 4; ln++) {
int level = intel_ddi_level(encoder, crtc_state, ln); int level = intel_ddi_level(encoder, crtc_state, ln);
val = intel_de_read(dev_priv, ICL_PORT_TX_DW7_LN(ln, phy)); intel_de_rmw(dev_priv, ICL_PORT_TX_DW7_LN(ln, phy),
val &= ~N_SCALAR_MASK; N_SCALAR_MASK,
val |= N_SCALAR(trans->entries[level].icl.dw7_n_scalar); N_SCALAR(trans->entries[level].icl.dw7_n_scalar));
intel_de_write(dev_priv, ICL_PORT_TX_DW7_LN(ln, phy), val);
} }
} }
@ -1134,16 +1128,14 @@ static void icl_combo_phy_set_signal_levels(struct intel_encoder *encoder,
* > 6 GHz (LN0=0, LN1=0, LN2=0, LN3=0) * > 6 GHz (LN0=0, LN1=0, LN2=0, LN3=0)
*/ */
for (ln = 0; ln < 4; ln++) { for (ln = 0; ln < 4; ln++) {
val = intel_de_read(dev_priv, ICL_PORT_TX_DW4_LN(ln, phy)); intel_de_rmw(dev_priv, ICL_PORT_TX_DW4_LN(ln, phy),
val &= ~LOADGEN_SELECT; LOADGEN_SELECT,
val |= icl_combo_phy_loadgen_select(crtc_state, ln); icl_combo_phy_loadgen_select(crtc_state, ln));
intel_de_write(dev_priv, ICL_PORT_TX_DW4_LN(ln, phy), val);
} }
/* 3. Set PORT_CL_DW5 SUS Clock Config to 11b */ /* 3. Set PORT_CL_DW5 SUS Clock Config to 11b */
val = intel_de_read(dev_priv, ICL_PORT_CL_DW5(phy)); intel_de_rmw(dev_priv, ICL_PORT_CL_DW5(phy),
val |= SUS_CLOCK_CONFIG; 0, SUS_CLOCK_CONFIG);
intel_de_write(dev_priv, ICL_PORT_CL_DW5(phy), val);
/* 4. Clear training enable to change swing values */ /* 4. Clear training enable to change swing values */
val = intel_de_read(dev_priv, ICL_PORT_TX_DW5_LN(0, phy)); val = intel_de_read(dev_priv, ICL_PORT_TX_DW5_LN(0, phy));