Matches BSPEC for DKL Phy.

Reviewed-by: Clint Taylor Clinton.A.Taylor@intel.com

-Clint

On 1/13/22 9:48 AM, José Roberto de Souza wrote:

TC voltage swing programming sequence was updated with a new step.

BSpec: 54956 Cc: stable@vger.kernel.org Cc: Jani Nikula jani.nikula@linux.intel.com Cc: Clint Taylor clinton.a.taylor@intel.com Cc: Imre Deak imre.deak@intel.com Signed-off-by: José Roberto de Souza jose.souza@intel.com

---

drivers/gpu/drm/i915/display/intel_ddi.c | 22 ++++++++++++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 8 ++++++-- 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 6ee0f77b79274..4e93eac926a56 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -1300,6 +1300,28 @@ static void tgl_dkl_phy_set_signal_levels(struct intel_encoder *encoder, intel_de_rmw(dev_priv, DKL_TX_DPCNTL2(tc_port), DKL_TX_DP20BITMODE, 0);

• if (IS_ALDERLAKE_P(dev_priv)) {
  

• 	u32 val;
  

• 	if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) {
  

• 		if (ln == 0) {
  

• 			val = DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX1(0);
  

• 			val |= DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX2(2);
  

• 		} else {
  

• 			val = DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX1(3);
  

• 			val |= DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX2(3);
  

• 		}
  

• 	} else {
  

• 		val = DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX1(0);
  

• 		val |= DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX2(0);
  

• 	}
  

• 	intel_de_rmw(dev_priv, DKL_TX_DPCNTL2(tc_port),
  

• 		     DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX1_MASK |
  

• 		     DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX2_MASK,
  

• 		     val);
  

• }
  

  } }

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 7c4013a0db615..ef6bc81800738 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -10085,8 +10085,12 @@ enum skl_power_gate { _DKL_PHY2_BASE) + \ _DKL_TX_DPCNTL1) -#define _DKL_TX_DPCNTL2 0x2C8 -#define DKL_TX_DP20BITMODE (1 << 2) +#define _DKL_TX_DPCNTL2 0x2C8 +#define DKL_TX_DP20BITMODE REG_BIT(2) +#define DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX1_MASK REG_GENMASK(4, 3) +#define DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX1(val) REG_FIELD_PREP(DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX1_MASK, (val)) +#define DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX2_MASK REG_GENMASK(6, 5) +#define DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX2(val) REG_FIELD_PREP(DKL_TX_DPCNTL2_CFG_LOADGENSELECT_TX2_MASK, (val)) #define DKL_TX_DPCNTL2(tc_port) _MMIO(_PORT(tc_port, \ _DKL_PHY1_BASE, \ _DKL_PHY2_BASE) + \