Skip to content

Commit 340614f

Browse files
ideakopsiff
authored andcommitted
drm/i915/adlp+: Add DSC early pixel count scaling WA (Wa_1409098942)
mainline inclusion from mainline-v6.10-rc1 category: bugfix 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 (cherry picked from commit 377cc98 https://anongit.freedesktop.org/git/drm-intel.git drm-intel-next) Signed-off-by: Charlton Lin <charlton.lin@intel.com> Conflicts: drivers/gpu/drm/i915/display/intel_display.c (use MTL_CHICKEN_TRANS/CHICKEN_TRANS rather than deprecated hsw function) Tested-by: Charlton Lin <charlton.lin@intel.com> Reviewed-by: Manasi Navare <navaremanasi@chromium.org> Signed-off-by: Rakshith M O <rakshith.m.o@intel.com> (cherry picked from commit 9e9b8a4d44e67ae02432006981206167b2f6f346) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent 147a499 commit 340614f

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
@@ -447,6 +447,14 @@ void intel_enable_transcoder(const struct intel_crtc_state *new_crtc_state)
447447
return;
448448
}
449449

450+
/* Wa_1409098942:adlp+ */
451+
if (DISPLAY_VER(dev_priv) >= 13 &&
452+
new_crtc_state->dsc.compression_enable) {
453+
val &= ~TRANSCONF_PIXEL_COUNT_SCALING_MASK;
454+
val |= REG_FIELD_PREP(TRANSCONF_PIXEL_COUNT_SCALING_MASK,
455+
TRANSCONF_PIXEL_COUNT_SCALING_X4);
456+
}
457+
450458
intel_de_write(dev_priv, TRANSCONF(cpu_transcoder),
451459
val | TRANSCONF_ENABLE);
452460
intel_de_posting_read(dev_priv, TRANSCONF(cpu_transcoder));
@@ -493,6 +501,11 @@ void intel_disable_transcoder(const struct intel_crtc_state *old_crtc_state)
493501
if (!IS_I830(dev_priv))
494502
val &= ~TRANSCONF_ENABLE;
495503

504+
/* Wa_1409098942:adlp+ */
505+
if (DISPLAY_VER(dev_priv) >= 13 &&
506+
old_crtc_state->dsc.compression_enable)
507+
val &= ~TRANSCONF_PIXEL_COUNT_SCALING_MASK;
508+
496509
intel_de_write(dev_priv, TRANSCONF(cpu_transcoder), val);
497510

498511
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
@@ -2588,6 +2588,9 @@
25882588
#define TRANSCONF_DITHER_TYPE_ST1 REG_FIELD_PREP(TRANSCONF_DITHER_TYPE_MASK, 1)
25892589
#define TRANSCONF_DITHER_TYPE_ST2 REG_FIELD_PREP(TRANSCONF_DITHER_TYPE_MASK, 2)
25902590
#define TRANSCONF_DITHER_TYPE_TEMP REG_FIELD_PREP(TRANSCONF_DITHER_TYPE_MASK, 3)
2591+
#define TRANSCONF_PIXEL_COUNT_SCALING_MASK REG_GENMASK(1, 0)
2592+
#define TRANSCONF_PIXEL_COUNT_SCALING_X4 1
2593+
25912594
#define _PIPEASTAT 0x70024
25922595
#define PIPE_FIFO_UNDERRUN_STATUS (1UL << 31)
25932596
#define SPRITE1_FLIP_DONE_INT_EN_VLV (1UL << 30)

0 commit comments

Comments
 (0)