Skip to content

Commit 377cc98

Browse files
committed
drm/i915/adlp+: Add DSC early pixel count scaling WA (Wa_1409098942)
Add a workaround to fix timing issues on links with DSC enabled - presumedly related to the audio functionality. Bspec requires enabling this workaround if audio is enabled on ADLP, however Windows enables it whenever DSC is enabled ADLP onwards; follow Windows. Bspec: 50490, 55424 v2: Fix WA code comment formatting. (Ankit) 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-5-imre.deak@intel.com
1 parent d4e745b commit 377cc98

2 files changed

Lines changed: 16 additions & 0 deletions

File tree

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,14 @@ void intel_enable_transcoder(const struct intel_crtc_state *new_crtc_state)
443443
return;
444444
}
445445

446+
/* Wa_1409098942:adlp+ */
447+
if (DISPLAY_VER(dev_priv) >= 13 &&
448+
new_crtc_state->dsc.compression_enable) {
449+
val &= ~TRANSCONF_PIXEL_COUNT_SCALING_MASK;
450+
val |= REG_FIELD_PREP(TRANSCONF_PIXEL_COUNT_SCALING_MASK,
451+
TRANSCONF_PIXEL_COUNT_SCALING_X4);
452+
}
453+
446454
intel_de_write(dev_priv, TRANSCONF(cpu_transcoder),
447455
val | TRANSCONF_ENABLE);
448456
intel_de_posting_read(dev_priv, TRANSCONF(cpu_transcoder));
@@ -489,6 +497,11 @@ void intel_disable_transcoder(const struct intel_crtc_state *old_crtc_state)
489497
if (!IS_I830(dev_priv))
490498
val &= ~TRANSCONF_ENABLE;
491499

500+
/* Wa_1409098942:adlp+ */
501+
if (DISPLAY_VER(dev_priv) >= 13 &&
502+
old_crtc_state->dsc.compression_enable)
503+
val &= ~TRANSCONF_PIXEL_COUNT_SCALING_MASK;
504+
492505
intel_de_write(dev_priv, TRANSCONF(cpu_transcoder), val);
493506

494507
if (DISPLAY_VER(dev_priv) >= 12)

drivers/gpu/drm/i915/i915_reg.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2596,6 +2596,9 @@
25962596
#define TRANSCONF_DITHER_TYPE_ST1 REG_FIELD_PREP(TRANSCONF_DITHER_TYPE_MASK, 1)
25972597
#define TRANSCONF_DITHER_TYPE_ST2 REG_FIELD_PREP(TRANSCONF_DITHER_TYPE_MASK, 2)
25982598
#define TRANSCONF_DITHER_TYPE_TEMP REG_FIELD_PREP(TRANSCONF_DITHER_TYPE_MASK, 3)
2599+
#define TRANSCONF_PIXEL_COUNT_SCALING_MASK REG_GENMASK(1, 0)
2600+
#define TRANSCONF_PIXEL_COUNT_SCALING_X4 1
2601+
25992602
#define _PIPEASTAT 0x70024
26002603
#define PIPE_FIFO_UNDERRUN_STATUS (1UL << 31)
26012604
#define SPRITE1_FLIP_DONE_INT_EN_VLV (1UL << 30)

0 commit comments

Comments
 (0)