Skip to content

Commit 385a95c

Browse files
surajk8tursulin
authored andcommitted
drm/i915/cx0_phy: Fix C10 pll programming sequence
According to spec VDR_CUSTOM_WIDTH register gets programmed after pll specific VDR registers and TX Lane programming registers are done. Moreover we only program into C10_VDR_CONTROL1 to update config and setup master lane once all VDR registers are written into. Bspec: 67636 Fixes: 51390cc ("drm/i915/mtl: Add Support for C10 PHY message bus and pll programming") Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com> Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20241216181554.2861381-1-suraj.kandpal@intel.com (cherry picked from commit f9d4185) Signed-off-by: Tvrtko Ursulin <tursulin@ursulin.net>
1 parent 4bbf902 commit 385a95c

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2115,14 +2115,6 @@ static void intel_c10_pll_program(struct intel_display *display,
21152115
0, C10_VDR_CTRL_MSGBUS_ACCESS,
21162116
MB_WRITE_COMMITTED);
21172117

2118-
/* Custom width needs to be programmed to 0 for both the phy lanes */
2119-
intel_cx0_rmw(encoder, INTEL_CX0_BOTH_LANES, PHY_C10_VDR_CUSTOM_WIDTH,
2120-
C10_VDR_CUSTOM_WIDTH_MASK, C10_VDR_CUSTOM_WIDTH_8_10,
2121-
MB_WRITE_COMMITTED);
2122-
intel_cx0_rmw(encoder, INTEL_CX0_BOTH_LANES, PHY_C10_VDR_CONTROL(1),
2123-
0, C10_VDR_CTRL_UPDATE_CFG,
2124-
MB_WRITE_COMMITTED);
2125-
21262118
/* Program the pll values only for the master lane */
21272119
for (i = 0; i < ARRAY_SIZE(pll_state->pll); i++)
21282120
intel_cx0_write(encoder, INTEL_CX0_LANE0, PHY_C10_VDR_PLL(i),
@@ -2132,6 +2124,10 @@ static void intel_c10_pll_program(struct intel_display *display,
21322124
intel_cx0_write(encoder, INTEL_CX0_LANE0, PHY_C10_VDR_CMN(0), pll_state->cmn, MB_WRITE_COMMITTED);
21332125
intel_cx0_write(encoder, INTEL_CX0_LANE0, PHY_C10_VDR_TX(0), pll_state->tx, MB_WRITE_COMMITTED);
21342126

2127+
/* Custom width needs to be programmed to 0 for both the phy lanes */
2128+
intel_cx0_rmw(encoder, INTEL_CX0_BOTH_LANES, PHY_C10_VDR_CUSTOM_WIDTH,
2129+
C10_VDR_CUSTOM_WIDTH_MASK, C10_VDR_CUSTOM_WIDTH_8_10,
2130+
MB_WRITE_COMMITTED);
21352131
intel_cx0_rmw(encoder, INTEL_CX0_LANE0, PHY_C10_VDR_CONTROL(1),
21362132
0, C10_VDR_CTRL_MASTER_LANE | C10_VDR_CTRL_UPDATE_CFG,
21372133
MB_WRITE_COMMITTED);

0 commit comments

Comments
 (0)