Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915/xe2lpd: Update C20 HDMI TMDS algorithm to include tx_misc
@ 2024-10-17 20:53 Gustavo Sousa
  2024-10-17 21:00 ` ✓ CI.Patch_applied: success for " Patchwork
                   ` (10 more replies)
  0 siblings, 11 replies; 18+ messages in thread
From: Gustavo Sousa @ 2024-10-17 20:53 UTC (permalink / raw)
  To: intel-gfx, intel-xe

There has been an update to the Bspec in which we need to set
tx_misc=0x5 field for C20 TX Context programming for HDMI TMDS for
Xe2_LPD and newer. That field is mapped to the bits 7:0 of
SRAM_GENERIC_<A/B>_TX_CNTX_CFG_1, which in turn translates to tx[1] of
our state struct. Update the algorithm to reflect this change.

Bspec: 74489
Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com>
---
 drivers/gpu/drm/i915/display/intel_cx0_phy.c    | 17 ++++++++++++++---
 .../gpu/drm/i915/display/intel_cx0_phy_regs.h   |  2 ++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.c b/drivers/gpu/drm/i915/display/intel_cx0_phy.c
index f73d576fd99e..22184b2d5a11 100644
--- a/drivers/gpu/drm/i915/display/intel_cx0_phy.c
+++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.c
@@ -2142,8 +2142,12 @@ static void intel_c10pll_dump_hw_state(struct drm_i915_private *i915,
 			    i + 2, hw_state->pll[i + 2], i + 3, hw_state->pll[i + 3]);
 }
 
-static int intel_c20_compute_hdmi_tmds_pll(u64 pixel_clock, struct intel_c20pll_state *pll_state)
+static int intel_c20_compute_hdmi_tmds_pll(struct intel_encoder *encoder,
+					   u64 pixel_clock,
+					   struct intel_c20pll_state *pll_state)
 {
+	struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+
 	u64 datarate;
 	u64 mpll_tx_clk_div;
 	u64 vco_freq_shift;
@@ -2154,6 +2158,7 @@ static int intel_c20_compute_hdmi_tmds_pll(u64 pixel_clock, struct intel_c20pll_
 	u64 mpll_fracn_rem;
 	u8  mpllb_ana_freq_vco;
 	u8  mpll_div_multiplier;
+	u16  tx_misc;
 
 	if (pixel_clock < 25175 || pixel_clock > 600000)
 		return -EINVAL;
@@ -2171,6 +2176,11 @@ static int intel_c20_compute_hdmi_tmds_pll(u64 pixel_clock, struct intel_c20pll_
 	mpll_div_multiplier = min_t(u8, div64_u64((vco_freq * 16 + (datarate >> 1)),
 						  datarate), 255);
 
+	if (DISPLAY_VER(i915) >= 20)
+		tx_misc = 0x5;
+	else
+		tx_misc = 0x0;
+
 	if (vco_freq <= DATARATE_3000000000)
 		mpllb_ana_freq_vco = MPLLB_ANA_FREQ_VCO_3;
 	else if (vco_freq <= DATARATE_3500000000)
@@ -2182,7 +2192,7 @@ static int intel_c20_compute_hdmi_tmds_pll(u64 pixel_clock, struct intel_c20pll_
 
 	pll_state->clock	= pixel_clock;
 	pll_state->tx[0]	= 0xbe88;
-	pll_state->tx[1]	= 0x9800;
+	pll_state->tx[1]	= 0x9800 | C20_PHY_TX_MISC(tx_misc);
 	pll_state->tx[2]	= 0x0000;
 	pll_state->cmn[0]	= 0x0500;
 	pll_state->cmn[1]	= 0x0005;
@@ -2266,7 +2276,8 @@ static int intel_c20pll_calc_state(struct intel_crtc_state *crtc_state,
 
 	/* try computed C20 HDMI tables before using consolidated tables */
 	if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) {
-		if (intel_c20_compute_hdmi_tmds_pll(crtc_state->port_clock,
+		if (intel_c20_compute_hdmi_tmds_pll(encoder,
+						    crtc_state->port_clock,
 						    &crtc_state->dpll_hw_state.cx0pll.c20) == 0)
 			return 0;
 	}
diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h b/drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h
index ab3ae110b68f..c1949aa1b909 100644
--- a/drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h
+++ b/drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h
@@ -280,6 +280,8 @@
 #define PHY_C20_B_TX_CNTX_CFG(i915, idx) \
 		((_IS_XE2HPD_C20(i915) ? _XE2HPD_C20_B_TX_CNTX_CFG : _MTL_C20_B_TX_CNTX_CFG) - (idx))
 #define   C20_PHY_TX_RATE		REG_GENMASK(2, 0)
+#define   C20_PHY_TX_MISC_MASK		REG_GENMASK(7, 0)
+#define   C20_PHY_TX_MISC(val)		REG_FIELD_PREP16(C20_PHY_TX_MISC_MASK, (val))
 
 #define PHY_C20_A_CMN_CNTX_CFG(i915, idx) \
 		((_IS_XE2HPD_C20(i915) ? _XE2HPD_C20_A_CMN_CNTX_CFG : _MTL_C20_A_CMN_CNTX_CFG) - (idx))
-- 
2.46.1


^ permalink raw reply related	[flat|nested] 18+ messages in thread
end of thread, other threads:[~2024-10-22 22:33 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-17 20:53 [PATCH] drm/i915/xe2lpd: Update C20 HDMI TMDS algorithm to include tx_misc Gustavo Sousa
2024-10-17 21:00 ` ✓ CI.Patch_applied: success for " Patchwork
2024-10-17 21:00 ` ✓ CI.checkpatch: " Patchwork
2024-10-17 21:01 ` ✓ CI.KUnit: " Patchwork
2024-10-17 21:13 ` ✓ CI.Build: " Patchwork
2024-10-17 21:15 ` ✓ CI.Hooks: " Patchwork
2024-10-17 21:16 ` ✗ CI.checksparse: warning " Patchwork
2024-10-17 21:35 ` ✓ CI.BAT: success " Patchwork
2024-10-18 13:22 ` ✗ CI.FULL: failure " Patchwork
2024-10-18 14:16 ` [PATCH] " Pottumuttu, Sai Teja
2024-10-18 15:59   ` Gustavo Sousa
2024-10-18 16:48     ` Pottumuttu, Sai Teja
2024-10-21 12:29 ` Jani Nikula
2024-10-21 12:59   ` Gustavo Sousa
2024-10-21 13:15     ` Jani Nikula
2024-10-22 22:29   ` Gustavo Sousa
2024-10-21 20:09 ` Bhadane, Dnyaneshwar
2024-10-22 22:32   ` Gustavo Sousa

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox