Commit c86e1873 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Use intel_de_rmw() for tgl dkl 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-14-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
parent 88a24415

drivers/gpu/drm/i915/display/intel_ddi.c

+17 −21
Original line number Diff line number Diff line
@@ -1308,7 +1308,6 @@ static void tgl_dkl_phy_set_signal_levels(struct intel_encoder *encoder, 


	for (ln = 0; ln < 2; ln++) {

		int level;

		u32 val;



		intel_de_write(dev_priv, HIP_INDEX_REG(tc_port),

			       HIP_INDEX_VAL(tc_port, ln));
@@ -1317,29 +1316,26 @@ static void tgl_dkl_phy_set_signal_levels(struct intel_encoder *encoder, 


		level = intel_ddi_level(encoder, crtc_state, 2*ln+0);



		val = intel_de_read(dev_priv, DKL_TX_DPCNTL0(tc_port));

		val &= ~(DKL_TX_PRESHOOT_COEFF_MASK |

		intel_de_rmw(dev_priv, DKL_TX_DPCNTL0(tc_port),

			     DKL_TX_PRESHOOT_COEFF_MASK |

			     DKL_TX_DE_EMPAHSIS_COEFF_MASK |

			 DKL_TX_VSWING_CONTROL_MASK);

		val |= DKL_TX_VSWING_CONTROL(trans->entries[level].dkl.vswing) |

			     DKL_TX_VSWING_CONTROL_MASK,

			     DKL_TX_PRESHOOT_COEFF(trans->entries[level].dkl.preshoot) |

			     DKL_TX_DE_EMPHASIS_COEFF(trans->entries[level].dkl.de_emphasis) |

			DKL_TX_PRESHOOT_COEFF(trans->entries[level].dkl.preshoot);

		intel_de_write(dev_priv, DKL_TX_DPCNTL0(tc_port), val);

			     DKL_TX_VSWING_CONTROL(trans->entries[level].dkl.vswing));



		level = intel_ddi_level(encoder, crtc_state, 2*ln+1);



		val = intel_de_read(dev_priv, DKL_TX_DPCNTL1(tc_port));

		val &= ~(DKL_TX_PRESHOOT_COEFF_MASK |

		intel_de_rmw(dev_priv, DKL_TX_DPCNTL1(tc_port),

			     DKL_TX_PRESHOOT_COEFF_MASK |

			     DKL_TX_DE_EMPAHSIS_COEFF_MASK |

			 DKL_TX_VSWING_CONTROL_MASK);

		val |= DKL_TX_VSWING_CONTROL(trans->entries[level].dkl.vswing) |

			     DKL_TX_VSWING_CONTROL_MASK,

			     DKL_TX_PRESHOOT_COEFF(trans->entries[level].dkl.preshoot) |

			     DKL_TX_DE_EMPHASIS_COEFF(trans->entries[level].dkl.de_emphasis) |

			DKL_TX_PRESHOOT_COEFF(trans->entries[level].dkl.preshoot);

		intel_de_write(dev_priv, DKL_TX_DPCNTL1(tc_port), val);

			     DKL_TX_VSWING_CONTROL(trans->entries[level].dkl.vswing));



		val = intel_de_read(dev_priv, DKL_TX_DPCNTL2(tc_port));

		val &= ~DKL_TX_DP20BITMODE;

		intel_de_write(dev_priv, DKL_TX_DPCNTL2(tc_port), val);

		intel_de_rmw(dev_priv, DKL_TX_DPCNTL2(tc_port),

			     DKL_TX_DP20BITMODE, 0);

	}

}