| Message ID | 20220210185223.95399-1-jose.souza@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] drm/i915/display: Group PSR2 prog sequences and workarounds | expand |
Reviewed-by: Jouni Högander <jouni.hogander@intel.com> for both patches. On Thu, 2022-02-10 at 10:52 -0800, José Roberto de Souza wrote: > Grouping inside of the same if all the programing sequences and > workarounds of PSR2. > The order of programing changed in intel_psr_enable_source() but > it will not affect PSR2 as at this point PSR2_ENABLE is still > disabled. > > Cc: Jouni Högander <jouni.hogander@intel.com> > Signed-off-by: José Roberto de Souza <jose.souza@intel.com> > --- > drivers/gpu/drm/i915/display/intel_psr.c | 77 ++++++++++++-------- > ---- > 1 file changed, 37 insertions(+), 40 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c > b/drivers/gpu/drm/i915/display/intel_psr.c > index a1a663f362e7d..72bd8d3261e0c 100644 > --- a/drivers/gpu/drm/i915/display/intel_psr.c > +++ b/drivers/gpu/drm/i915/display/intel_psr.c > @@ -1069,25 +1069,6 @@ static void intel_psr_enable_source(struct > intel_dp *intel_dp) > enum transcoder cpu_transcoder = intel_dp->psr.transcoder; > u32 mask; > > - if (intel_dp->psr.psr2_enabled && DISPLAY_VER(dev_priv) == 9) { > - i915_reg_t reg = CHICKEN_TRANS(cpu_transcoder); > - u32 chicken = intel_de_read(dev_priv, reg); > - > - chicken |= PSR2_VSC_ENABLE_PROG_HEADER | > - PSR2_ADD_VERTICAL_LINE_COUNT; > - intel_de_write(dev_priv, reg, chicken); > - } > - > - /* > - * Wa_16014451276:adlp > - * All supported adlp panels have 1-based X granularity, this > may > - * cause issues if non-supported panels are used. > - */ > - if (IS_ALDERLAKE_P(dev_priv) && > - intel_dp->psr.psr2_enabled) > - intel_de_rmw(dev_priv, CHICKEN_TRANS(cpu_transcoder), > 0, > - ADLP_1_BASED_X_GRANULARITY); > - > /* > * Per Spec: Avoid continuous PSR exit by masking MEMUP and HPD > also > * mask LPSP to avoid dependency on other drivers that might > block > @@ -1126,18 +1107,33 @@ static void intel_psr_enable_source(struct > intel_dp *intel_dp) > intel_dp->psr.psr2_sel_fetch_enabled ? > IGNORE_PSR2_HW_TRACKING : 0); > > - /* Wa_16011168373:adl-p */ > - if (IS_ADLP_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0) && > - intel_dp->psr.psr2_enabled) > - intel_de_rmw(dev_priv, > - TRANS_SET_CONTEXT_LATENCY(intel_dp- > >psr.transcoder), > - TRANS_SET_CONTEXT_LATENCY_MASK, > - TRANS_SET_CONTEXT_LATENCY_VALUE(1)); > + if (intel_dp->psr.psr2_enabled) { > + if (DISPLAY_VER(dev_priv) == 9) > + intel_de_rmw(dev_priv, > CHICKEN_TRANS(cpu_transcoder), 0, > + PSR2_VSC_ENABLE_PROG_HEADER | > + PSR2_ADD_VERTICAL_LINE_COUNT); > > - /* Wa_16012604467:adlp */ > - if (IS_ALDERLAKE_P(dev_priv) && intel_dp->psr.psr2_enabled) > - intel_de_rmw(dev_priv, CLKGATE_DIS_MISC, 0, > - CLKGATE_DIS_MISC_DMASC_GATING_DIS); > + /* > + * Wa_16014451276:adlp > + * All supported adlp panels have 1-based X > granularity, this may > + * cause issues if non-supported panels are used. > + */ > + if (IS_ALDERLAKE_P(dev_priv)) > + intel_de_rmw(dev_priv, > CHICKEN_TRANS(cpu_transcoder), 0, > + ADLP_1_BASED_X_GRANULARITY); > + > + /* Wa_16011168373:adl-p */ > + if (IS_ADLP_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0)) > + intel_de_rmw(dev_priv, > + TRANS_SET_CONTEXT_LATENCY(intel_dp > ->psr.transcoder), > + TRANS_SET_CONTEXT_LATENCY_MASK, > + TRANS_SET_CONTEXT_LATENCY_VALUE(1) > ); > + > + /* Wa_16012604467:adlp */ > + if (IS_ALDERLAKE_P(dev_priv)) > + intel_de_rmw(dev_priv, CLKGATE_DIS_MISC, 0, > + CLKGATE_DIS_MISC_DMASC_GATING_DIS) > ; > + } > } > > static bool psr_interrupt_error_check(struct intel_dp *intel_dp) > @@ -1290,17 +1286,18 @@ static void intel_psr_disable_locked(struct > intel_dp *intel_dp) > intel_de_rmw(dev_priv, CHICKEN_PAR1_1, > DIS_RAM_BYPASS_PSR2_MAN_TRACK, 0); > > - /* Wa_16011168373:adl-p */ > - if (IS_ADLP_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0) && > - intel_dp->psr.psr2_enabled) > - intel_de_rmw(dev_priv, > - TRANS_SET_CONTEXT_LATENCY(intel_dp- > >psr.transcoder), > - TRANS_SET_CONTEXT_LATENCY_MASK, 0); > + if (intel_dp->psr.psr2_enabled) { > + /* Wa_16011168373:adl-p */ > + if (IS_ADLP_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0)) > + intel_de_rmw(dev_priv, > + TRANS_SET_CONTEXT_LATENCY(intel_dp > ->psr.transcoder), > + TRANS_SET_CONTEXT_LATENCY_MASK, > 0); > > - /* Wa_16012604467:adlp */ > - if (IS_ALDERLAKE_P(dev_priv) && intel_dp->psr.psr2_enabled) > - intel_de_rmw(dev_priv, CLKGATE_DIS_MISC, > - CLKGATE_DIS_MISC_DMASC_GATING_DIS, 0); > + /* Wa_16012604467:adlp */ > + if (IS_ALDERLAKE_P(dev_priv)) > + intel_de_rmw(dev_priv, CLKGATE_DIS_MISC, > + CLKGATE_DIS_MISC_DMASC_GATING_DIS, > 0); > + } > > intel_snps_phy_update_psr_power_state(dev_priv, phy, false); > BR, Jouni Högander
On Fri, 2022-02-11 at 00:04 +0000, Patchwork wrote:
Patch Details
Series: series starting with [1/2] drm/i915/display: Group PSR2 prog sequences and workarounds
URL: https://patchwork.freedesktop.org/series/99989/
State: success
Details: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/index.html
CI Bug Log - changes from CI_DRM_11214_full -> Patchwork_22245_full
Summary
SUCCESS
No regressions found.
pushed to drm-intel-next, thanks for the review Jouni.
Participating hosts (11 -> 11)
No changes in participating hosts
Known issues
Here are the changes found in Patchwork_22245_full that come from known issues:
CI changes
Issues hit
* boot:
* shard-skl: (PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl8/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl8/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl8/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl7/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl7/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl4/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl4/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl4/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl3/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl3/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl1/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl1/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl10/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl10/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl10/boot.html>) -> (PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl8/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl8/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl8/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl7/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl7/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl7/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl4/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl4/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl3/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl2/boot.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl2/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl1/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl1/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl10/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl10/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl10/boot.html>) ([i915#5032])
IGT changes
Issues hit
* igt@gem_eio@kms:
* shard-tglb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-tglb7/igt@gem_eio@kms.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-tglb1/igt@gem_eio@kms.html> ([i915#232])
* igt@gem_exec_capture@pi@vecs0:
* shard-skl: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl9/igt@gem_exec_capture@pi@vecs0.html> ([i915#4547])
* igt@gem_exec_fair@basic-none@vcs1:
* shard-iclb: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-iclb1/igt@gem_exec_fair@basic-none@vcs1.html> ([i915#2842])
* igt@gem_exec_fair@basic-pace@rcs0:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-iclb3/igt@gem_exec_fair@basic-pace@rcs0.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-iclb8/igt@gem_exec_fair@basic-pace@rcs0.html> ([i915#2842])
* igt@gem_exec_fair@basic-pace@vcs1:
* shard-kbl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-kbl3/igt@gem_exec_fair@basic-pace@vcs1.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-kbl3/igt@gem_exec_fair@basic-pace@vcs1.html> ([i915#2842]) +1 similar issue
* igt@gem_exec_schedule@submit-early-slice@vcs0:
* shard-skl: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl1/igt@gem_exec_schedule@submit-early-slice@vcs0.html> ([i915#3797])
* igt@gem_exec_whisper@basic-queues-priority:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-iclb1/igt@gem_exec_whisper@basic-queues-priority.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-iclb7/igt@gem_exec_whisper@basic-queues-priority.html> ([i915#1895])
* igt@gem_huc_copy@huc-copy:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-apl3/igt@gem_huc_copy@huc-copy.html> ([fdo#109271] / [i915#2190])
* shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-kbl1/igt@gem_huc_copy@huc-copy.html> ([fdo#109271] / [i915#2190])
* igt@gem_lmem_swapping@heavy-multi:
* shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-kbl6/igt@gem_lmem_swapping@heavy-multi.html> ([fdo#109271] / [i915#4613])
* igt@gem_lmem_swapping@heavy-random:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-apl8/igt@gem_lmem_swapping@heavy-random.html> ([fdo#109271] / [i915#4613])
* igt@gem_lmem_swapping@random-engines:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl2/igt@gem_lmem_swapping@random-engines.html> ([fdo#109271] / [i915#4613]) +1 similar issue
* igt@gem_pread@exhaustion:
* shard-tglb: NOTRUN -> WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-tglb6/igt@gem_pread@exhaustion.html> ([i915#2658])
* igt@gem_userptr_blits@vma-merge:
* shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl4/igt@gem_userptr_blits@vma-merge.html> ([i915#3318])
* igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-async-flip:
* shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl2/igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-async-flip.html> ([i915#3743]) +1 similar issue
* igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-async-flip:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-tglb6/igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-async-flip.html> ([fdo#111615])
* igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-hflip:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-apl8/igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-hflip.html> ([fdo#109271] / [i915#3777]) +2 similar issues
* igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-hflip-async-flip:
* shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-kbl1/igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-hflip-async-flip.html> ([fdo#109271] / [i915#3777]) +2 similar issues
* igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl2/igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip.html> ([fdo#109271] / [i915#3777]) +4 similar issues
* igt@kms_ccs@pipe-b-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc:
* shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-kbl1/igt@kms_ccs@pipe-b-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc.html> ([fdo#109271] / [i915#3886]) +3 similar issues
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-apl3/igt@kms_ccs@pipe-b-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc.html> ([fdo#109271] / [i915#3886]) +3 similar issues
* igt@kms_ccs@pipe-c-bad-rotation-90-y_tiled_gen12_rc_ccs_cc:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl9/igt@kms_ccs@pipe-c-bad-rotation-90-y_tiled_gen12_rc_ccs_cc.html> ([fdo#109271] / [i915#3886]) +8 similar issues
* igt@kms_ccs@pipe-d-crc-primary-basic-y_tiled_gen12_mc_ccs:
* shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-kbl1/igt@kms_ccs@pipe-d-crc-primary-basic-y_tiled_gen12_mc_ccs.html> ([fdo#109271]) +81 similar issues
* igt@kms_chamelium@dp-hpd-enable-disable-mode:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-tglb6/igt@kms_chamelium@dp-hpd-enable-disable-mode.html> ([fdo#109284] / [fdo#111827]) +1 similar issue
* igt@kms_chamelium@hdmi-hpd-for-each-pipe:
* shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-kbl6/igt@kms_chamelium@hdmi-hpd-for-each-pipe.html> ([fdo#109271] / [fdo#111827]) +5 similar issues
* igt@kms_chamelium@vga-hpd-after-suspend:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl9/igt@kms_chamelium@vga-hpd-after-suspend.html> ([fdo#109271] / [fdo#111827]) +16 similar issues
* igt@kms_color_chamelium@pipe-a-ctm-0-5:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-apl3/igt@kms_color_chamelium@pipe-a-ctm-0-5.html> ([fdo#109271] / [fdo#111827]) +6 similar issues
* igt@kms_cursor_crc@pipe-d-cursor-256x256-rapid-movement:
* shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-iclb1/igt@kms_cursor_crc@pipe-d-cursor-256x256-rapid-movement.html> ([fdo#109278]) +1 similar issue
* igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl6/igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl8/igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions.html> ([i915#1982])
* igt@kms_cursor_legacy@cursora-vs-flipb-atomic-transitions:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-tglb6/igt@kms_cursor_legacy@cursora-vs-flipb-atomic-transitions.html> ([fdo#109274] / [fdo#111825])
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl10/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl1/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html> ([i915#2346])
* igt@kms_flip@dpms-vs-vblank-race@b-hdmi-a1:
* shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-glk6/igt@kms_flip@dpms-vs-vblank-race@b-hdmi-a1.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-glk9/igt@kms_flip@dpms-vs-vblank-race@b-hdmi-a1.html> ([i915#407])
* igt@kms_flip@flip-vs-suspend@a-dp1:
* shard-apl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-apl8/igt@kms_flip@flip-vs-suspend@a-dp1.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-apl6/igt@kms_flip@flip-vs-suspend@a-dp1.html> ([i915#180]) +4 similar issues
* igt@kms_flip@flip-vs-suspend@c-dp1:
* shard-kbl: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-kbl3/igt@kms_flip@flip-vs-suspend@c-dp1.html> ([i915#636])
* igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-indfb-plflip-blt:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-tglb6/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-indfb-plflip-blt.html> ([fdo#109280] / [fdo#111825]) +2 similar issues
* igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-spr-indfb-onoff:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl9/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-spr-indfb-onoff.html> ([fdo#109271]) +182 similar issues
* igt@kms_hdr@static-toggle-suspend:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-tglb6/igt@kms_hdr@static-toggle-suspend.html> ([i915#1187])
* igt@kms_pipe_crc_basic@disable-crc-after-crtc-pipe-d:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-apl8/igt@kms_pipe_crc_basic@disable-crc-after-crtc-pipe-d.html> ([fdo#109271] / [i915#533])
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
* shard-kbl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-kbl4/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-kbl4/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html> ([i915#180]) +6 similar issues
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-d:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl4/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-d.html> ([fdo#109271] / [i915#533]) +2 similar issues
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-max:
* shard-apl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-apl3/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-max.html> ([fdo#108145] / [i915#265])
* igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
* shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl9/igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb.html> ([fdo#108145] / [i915#265]) +3 similar issues
* igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb:
* shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl2/igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb.html> ([i915#265])
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max:
* shard-kbl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-kbl6/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max.html> ([fdo#108145] / [i915#265]) +2 similar issues
* igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-apl3/igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping.html> ([fdo#109271] / [i915#2733])
* shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-kbl1/igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping.html> ([fdo#109271] / [i915#2733])
* igt@kms_psr2_sf@overlay-plane-update-continuous-sf:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-apl8/igt@kms_psr2_sf@overlay-plane-update-continuous-sf.html> ([fdo#109271] / [i915#658])
* igt@kms_psr2_su@page_flip-nv12:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl2/igt@kms_psr2_su@page_flip-nv12.html> ([fdo#109271] / [i915#658])
* igt@kms_psr@psr2_primary_mmap_cpu:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-iclb5/igt@kms_psr@psr2_primary_mmap_cpu.html> ([fdo#109441]) +1 similar issue
* igt@kms_sysfs_edid_timing:
* shard-apl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-apl3/igt@kms_sysfs_edid_timing.html> ([IGT#2])
* shard-kbl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-kbl1/igt@kms_sysfs_edid_timing.html> ([IGT#2])
* igt@kms_vblank@pipe-d-wait-forked-hang:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-apl3/igt@kms_vblank@pipe-d-wait-forked-hang.html> ([fdo#109271]) +71 similar issues
* igt@kms_writeback@writeback-invalid-parameters:
* shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-kbl6/igt@kms_writeback@writeback-invalid-parameters.html> ([fdo#109271] / [i915#2437])
* igt@kms_writeback@writeback-pixel-formats:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl4/igt@kms_writeback@writeback-pixel-formats.html> ([fdo#109271] / [i915#2437]) +1 similar issue
* igt@nouveau_crc@ctx-flip-threshold-reset-after-capture:
* shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-iclb1/igt@nouveau_crc@ctx-flip-threshold-reset-after-capture.html> ([i915#2530])
* igt@nouveau_crc@pipe-a-source-outp-inactive:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-tglb6/igt@nouveau_crc@pipe-a-source-outp-inactive.html> ([i915#2530]) +1 similar issue
* igt@perf@gen8-unprivileged-single-ctx-counters:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-tglb6/igt@perf@gen8-unprivileged-single-ctx-counters.html> ([fdo#109289])
* igt@prime_nv_api@i915_nv_import_twice:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-tglb3/igt@prime_nv_api@i915_nv_import_twice.html> ([fdo#109291])
* igt@sysfs_clients@create:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-apl3/igt@sysfs_clients@create.html> ([fdo#109271] / [i915#2994])
* shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-kbl1/igt@sysfs_clients@create.html> ([fdo#109271] / [i915#2994])
* igt@sysfs_clients@fair-1:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl2/igt@sysfs_clients@fair-1.html> ([fdo#109271] / [i915#2994]) +1 similar issue
Possible fixes
* igt@feature_discovery@psr2:
* shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-iclb5/igt@feature_discovery@psr2.html> ([i915#658]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-iclb2/igt@feature_discovery@psr2.html>
* igt@gem_exec_fair@basic-none-share@rcs0:
* shard-iclb: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-iclb2/igt@gem_exec_fair@basic-none-share@rcs0.html> ([i915#2842]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-iclb5/igt@gem_exec_fair@basic-none-share@rcs0.html>
* shard-tglb: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-tglb5/igt@gem_exec_fair@basic-none-share@rcs0.html> ([i915#2842]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-tglb5/igt@gem_exec_fair@basic-none-share@rcs0.html>
* igt@gem_exec_fair@basic-none@vcs0:
* shard-kbl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-kbl1/igt@gem_exec_fair@basic-none@vcs0.html> ([i915#2842]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-kbl1/igt@gem_exec_fair@basic-none@vcs0.html> +1 similar issue
* igt@gem_exec_fair@basic-none@vecs0:
* shard-apl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-apl4/igt@gem_exec_fair@basic-none@vecs0.html> ([i915#2842]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-apl4/igt@gem_exec_fair@basic-none@vecs0.html>
* igt@gem_exec_fair@basic-pace-share@rcs0:
* {shard-tglu}: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-tglu-1/igt@gem_exec_fair@basic-pace-share@rcs0.html> ([i915#2842]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-tglu-4/igt@gem_exec_fair@basic-pace-share@rcs0.html>
* igt@gem_exec_whisper@basic-contexts-priority-all:
* shard-glk: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-glk2/igt@gem_exec_whisper@basic-contexts-priority-all.html> ([i915#118]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-glk5/igt@gem_exec_whisper@basic-contexts-priority-all.html>
* igt@gem_huc_copy@huc-copy:
* shard-tglb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-tglb6/igt@gem_huc_copy@huc-copy.html> ([i915#2190]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-tglb8/igt@gem_huc_copy@huc-copy.html>
* igt@i915_suspend@fence-restore-tiled2untiled:
* shard-apl: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-apl7/igt@i915_suspend@fence-restore-tiled2untiled.html> ([i915#180]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-apl8/igt@i915_suspend@fence-restore-tiled2untiled.html> +2 similar issues
* igt@kms_fbcon_fbt@fbc-suspend:
* shard-kbl: INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-kbl6/igt@kms_fbcon_fbt@fbc-suspend.html> ([i915#180] / [i915#636]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-kbl3/igt@kms_fbcon_fbt@fbc-suspend.html>
* igt@kms_flip@flip-vs-expired-vblank@b-edp1:
* shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl9/igt@kms_flip@flip-vs-expired-vblank@b-edp1.html> ([i915#79]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl1/igt@kms_flip@flip-vs-expired-vblank@b-edp1.html>
* igt@kms_flip@flip-vs-expired-vblank@b-hdmi-a1:
* shard-glk: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-glk1/igt@kms_flip@flip-vs-expired-vblank@b-hdmi-a1.html> ([i915#79]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-glk4/igt@kms_flip@flip-vs-expired-vblank@b-hdmi-a1.html>
* igt@kms_frontbuffer_tracking@fbc-suspend:
* shard-kbl: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-kbl6/igt@kms_frontbuffer_tracking@fbc-suspend.html> ([i915#180]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-kbl1/igt@kms_frontbuffer_tracking@fbc-suspend.html> +2 similar issues
* igt@kms_hdr@bpc-switch-dpms:
* shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-skl9/igt@kms_hdr@bpc-switch-dpms.html> ([i915#1188]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-skl1/igt@kms_hdr@bpc-switch-dpms.html>
* igt@kms_psr@psr2_sprite_mmap_cpu:
* shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-iclb8/igt@kms_psr@psr2_sprite_mmap_cpu.html> ([fdo#109441]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_cpu.html>
Warnings
* igt@gem_exec_balancer@parallel-contexts:
* shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-iclb5/igt@gem_exec_balancer@parallel-contexts.html> ([i915#4525]) -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-iclb2/igt@gem_exec_balancer@parallel-contexts.html> ([i915#5076])
* igt@gem_exec_balancer@parallel-ordering:
* shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-iclb6/igt@gem_exec_balancer@parallel-ordering.html> ([i915#4525]) -> DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-iclb1/igt@gem_exec_balancer@parallel-ordering.html> ([i915#5076])
* igt@i915_pm_rc6_residency@rc6-fence:
* shard-iclb: WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-iclb8/igt@i915_pm_rc6_residency@rc6-fence.html> ([i915#2684]) -> WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-iclb3/igt@i915_pm_rc6_residency@rc6-fence.html> ([i915#1804] / [i915#2684])
* igt@kms_color@pipe-d-ctm-negative:
* shard-glk: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-glk4/igt@kms_color@pipe-d-ctm-negative.html> ([fdo#109271] / [i915#1888]) -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-glk1/igt@kms_color@pipe-d-ctm-negative.html> ([fdo#109271])
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area:
* shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-iclb8/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area.html> ([fdo#111068] / [i915#658]) -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22245/shard-iclb2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area.html> ([i915#2920])
* igt@runner@aborted:
* shard-kbl: (FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-kbl1/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-kbl1/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-kbl3/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-kbl6/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-kbl6/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-kbl7/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-kbl4/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-kbl7/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11214/shard-kbl7/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11>, [FAIL][164], [FAIL][165], [FAIL][166]) ([fdo#109271] / [i915#180] / [i915#1814] / [i915#3002] / [i915#4312] / [i915#602] / [i915#92]) -> ([FAIL][167], [FAIL][168], [FAIL][169], [FAIL][170], [FAIL][171], [FAIL][172], [FAIL][173], [FAIL][174], [FAIL][175], [FAIL][176], [FAIL][177], [FAIL][178], [FAIL][179]) ([i915#1436] / [i915#180] / [i915#1814] / [i915#3002] / [i915#4312])
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index a1a663f362e7d..72bd8d3261e0c 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -1069,25 +1069,6 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp) enum transcoder cpu_transcoder = intel_dp->psr.transcoder; u32 mask; - if (intel_dp->psr.psr2_enabled && DISPLAY_VER(dev_priv) == 9) { - i915_reg_t reg = CHICKEN_TRANS(cpu_transcoder); - u32 chicken = intel_de_read(dev_priv, reg); - - chicken |= PSR2_VSC_ENABLE_PROG_HEADER | - PSR2_ADD_VERTICAL_LINE_COUNT; - intel_de_write(dev_priv, reg, chicken); - } - - /* - * Wa_16014451276:adlp - * All supported adlp panels have 1-based X granularity, this may - * cause issues if non-supported panels are used. - */ - if (IS_ALDERLAKE_P(dev_priv) && - intel_dp->psr.psr2_enabled) - intel_de_rmw(dev_priv, CHICKEN_TRANS(cpu_transcoder), 0, - ADLP_1_BASED_X_GRANULARITY); - /* * Per Spec: Avoid continuous PSR exit by masking MEMUP and HPD also * mask LPSP to avoid dependency on other drivers that might block @@ -1126,18 +1107,33 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp) intel_dp->psr.psr2_sel_fetch_enabled ? IGNORE_PSR2_HW_TRACKING : 0); - /* Wa_16011168373:adl-p */ - if (IS_ADLP_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0) && - intel_dp->psr.psr2_enabled) - intel_de_rmw(dev_priv, - TRANS_SET_CONTEXT_LATENCY(intel_dp->psr.transcoder), - TRANS_SET_CONTEXT_LATENCY_MASK, - TRANS_SET_CONTEXT_LATENCY_VALUE(1)); + if (intel_dp->psr.psr2_enabled) { + if (DISPLAY_VER(dev_priv) == 9) + intel_de_rmw(dev_priv, CHICKEN_TRANS(cpu_transcoder), 0, + PSR2_VSC_ENABLE_PROG_HEADER | + PSR2_ADD_VERTICAL_LINE_COUNT); - /* Wa_16012604467:adlp */ - if (IS_ALDERLAKE_P(dev_priv) && intel_dp->psr.psr2_enabled) - intel_de_rmw(dev_priv, CLKGATE_DIS_MISC, 0, - CLKGATE_DIS_MISC_DMASC_GATING_DIS); + /* + * Wa_16014451276:adlp + * All supported adlp panels have 1-based X granularity, this may + * cause issues if non-supported panels are used. + */ + if (IS_ALDERLAKE_P(dev_priv)) + intel_de_rmw(dev_priv, CHICKEN_TRANS(cpu_transcoder), 0, + ADLP_1_BASED_X_GRANULARITY); + + /* Wa_16011168373:adl-p */ + if (IS_ADLP_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0)) + intel_de_rmw(dev_priv, + TRANS_SET_CONTEXT_LATENCY(intel_dp->psr.transcoder), + TRANS_SET_CONTEXT_LATENCY_MASK, + TRANS_SET_CONTEXT_LATENCY_VALUE(1)); + + /* Wa_16012604467:adlp */ + if (IS_ALDERLAKE_P(dev_priv)) + intel_de_rmw(dev_priv, CLKGATE_DIS_MISC, 0, + CLKGATE_DIS_MISC_DMASC_GATING_DIS); + } } static bool psr_interrupt_error_check(struct intel_dp *intel_dp) @@ -1290,17 +1286,18 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp) intel_de_rmw(dev_priv, CHICKEN_PAR1_1, DIS_RAM_BYPASS_PSR2_MAN_TRACK, 0); - /* Wa_16011168373:adl-p */ - if (IS_ADLP_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0) && - intel_dp->psr.psr2_enabled) - intel_de_rmw(dev_priv, - TRANS_SET_CONTEXT_LATENCY(intel_dp->psr.transcoder), - TRANS_SET_CONTEXT_LATENCY_MASK, 0); + if (intel_dp->psr.psr2_enabled) { + /* Wa_16011168373:adl-p */ + if (IS_ADLP_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0)) + intel_de_rmw(dev_priv, + TRANS_SET_CONTEXT_LATENCY(intel_dp->psr.transcoder), + TRANS_SET_CONTEXT_LATENCY_MASK, 0); - /* Wa_16012604467:adlp */ - if (IS_ALDERLAKE_P(dev_priv) && intel_dp->psr.psr2_enabled) - intel_de_rmw(dev_priv, CLKGATE_DIS_MISC, - CLKGATE_DIS_MISC_DMASC_GATING_DIS, 0); + /* Wa_16012604467:adlp */ + if (IS_ALDERLAKE_P(dev_priv)) + intel_de_rmw(dev_priv, CLKGATE_DIS_MISC, + CLKGATE_DIS_MISC_DMASC_GATING_DIS, 0); + } intel_snps_phy_update_psr_power_state(dev_priv, phy, false);
Grouping inside of the same if all the programing sequences and workarounds of PSR2. The order of programing changed in intel_psr_enable_source() but it will not affect PSR2 as at this point PSR2_ENABLE is still disabled. Cc: Jouni Högander <jouni.hogander@intel.com> Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- drivers/gpu/drm/i915/display/intel_psr.c | 77 ++++++++++++------------ 1 file changed, 37 insertions(+), 40 deletions(-)