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

drm/i915: Query the vswing levels per-lane for icl combo phy

Browse Source 
Prepare for per-lane drive settings by querying the desired vswing
level per-lane.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211006204937.30774-9-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:29 +03:00
parent f20ca899a7
commit 31e914a230
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1040,7 +1040,6 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder,
const struct intel_crtc_state *crtc_state) const struct intel_crtc_state *crtc_state)
{ {
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
int level = intel_ddi_level(encoder, crtc_state, 0);
const struct intel_ddi_buf_trans *trans; const struct intel_ddi_buf_trans *trans;
enum phy phy = intel_port_to_phy(dev_priv, encoder->port); enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
int n_entries, ln; int n_entries, ln;
@ -1070,6 +1069,8 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder,
/* Program PORT_TX_DW2 */ /* Program PORT_TX_DW2 */
for (ln = 0; ln < 4; ln++) { for (ln = 0; ln < 4; ln++) {
int level = intel_ddi_level(encoder, crtc_state, ln);
val = intel_de_read(dev_priv, ICL_PORT_TX_DW2_LN(ln, phy)); val = intel_de_read(dev_priv, ICL_PORT_TX_DW2_LN(ln, phy));
val &= ~(SWING_SEL_LOWER_MASK | SWING_SEL_UPPER_MASK | val &= ~(SWING_SEL_LOWER_MASK | SWING_SEL_UPPER_MASK |
RCOMP_SCALAR_MASK); RCOMP_SCALAR_MASK);
@ -1083,6 +1084,8 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder,
/* Program PORT_TX_DW4 */ /* Program PORT_TX_DW4 */
/* We cannot write to GRP. It would overwrite individual loadgen. */ /* We cannot write to GRP. It would overwrite individual loadgen. */
for (ln = 0; ln < 4; ln++) { for (ln = 0; ln < 4; ln++) {
int level = intel_ddi_level(encoder, crtc_state, ln);
val = intel_de_read(dev_priv, ICL_PORT_TX_DW4_LN(ln, phy)); val = intel_de_read(dev_priv, ICL_PORT_TX_DW4_LN(ln, phy));
val &= ~(POST_CURSOR_1_MASK | POST_CURSOR_2_MASK | val &= ~(POST_CURSOR_1_MASK | POST_CURSOR_2_MASK |
CURSOR_COEFF_MASK); CURSOR_COEFF_MASK);
@ -1094,6 +1097,8 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder,
/* 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);
val = intel_de_read(dev_priv, ICL_PORT_TX_DW7_LN(ln, phy)); val = intel_de_read(dev_priv, ICL_PORT_TX_DW7_LN(ln, phy));
val &= ~N_SCALAR_MASK; val &= ~N_SCALAR_MASK;
val |= N_SCALAR(trans->entries[level].icl.dw7_n_scalar); val |= N_SCALAR(trans->entries[level].icl.dw7_n_scalar);