Skip to content

Commit 9655a9a

Browse files
committed
drm/i915/adlp: Add MST FEC BS jitter WA (Wa_14013163432)
Add a workaround to fix BS (blank start) to BS jitter issues on MST links when FEC is enabled. Neither Bspec requires this nor Windows clears the WA when disabling the output - presumedly because CHICKEN_MISC_3 gets reset after disabling the pipe/transcoder - so follow suit. Bspec: 50050, 55424 Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> Signed-off-by: Imre Deak <imre.deak@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240129175533.904590-2-imre.deak@intel.com
1 parent 0396403 commit 9655a9a

2 files changed

Lines changed: 27 additions & 0 deletions

File tree

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,6 +1119,28 @@ static void intel_mst_pre_enable_dp(struct intel_atomic_state *state,
11191119
intel_ddi_set_dp_msa(pipe_config, conn_state);
11201120
}
11211121

1122+
static void enable_bs_jitter_was(const struct intel_crtc_state *crtc_state)
1123+
{
1124+
struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev);
1125+
u32 clear = 0;
1126+
u32 set = 0;
1127+
1128+
if (!IS_ALDERLAKE_P(i915))
1129+
return;
1130+
1131+
if (!IS_DISPLAY_STEP(i915, STEP_D0, STEP_FOREVER))
1132+
return;
1133+
1134+
/* Wa_14013163432:adlp */
1135+
if (crtc_state->fec_enable || intel_dp_is_uhbr(crtc_state))
1136+
set |= DP_MST_FEC_BS_JITTER_WA(crtc_state->cpu_transcoder);
1137+
1138+
if (!clear && !set)
1139+
return;
1140+
1141+
intel_de_rmw(i915, CHICKEN_MISC_3, clear, set);
1142+
}
1143+
11221144
static void intel_mst_enable_dp(struct intel_atomic_state *state,
11231145
struct intel_encoder *encoder,
11241146
const struct intel_crtc_state *pipe_config,
@@ -1147,6 +1169,8 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state,
11471169
TRANS_DP2_VFREQ_PIXEL_CLOCK(crtc_clock_hz & 0xffffff));
11481170
}
11491171

1172+
enable_bs_jitter_was(pipe_config);
1173+
11501174
intel_ddi_enable_transcoder_func(encoder, pipe_config);
11511175

11521176
clear_act_sent(encoder, pipe_config);

drivers/gpu/drm/i915/i915_reg.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4564,6 +4564,9 @@
45644564
#define GLK_CL1_PWR_DOWN REG_BIT(11)
45654565
#define GLK_CL0_PWR_DOWN REG_BIT(10)
45664566

4567+
#define CHICKEN_MISC_3 _MMIO(0x42088)
4568+
#define DP_MST_FEC_BS_JITTER_WA(trans) REG_BIT(0 + (trans) - TRANSCODER_A)
4569+
45674570
#define CHICKEN_MISC_4 _MMIO(0x4208c)
45684571
#define CHICKEN_FBC_STRIDE_OVERRIDE REG_BIT(13)
45694572
#define CHICKEN_FBC_STRIDE_MASK REG_GENMASK(12, 0)

0 commit comments

Comments
 (0)