drm/i915/psr: Implement Wa_14015648006
Subsystems (3)
PATCH v3 1/1 drm/i915/psr: Implement Wa_14015648006
Add 4th pipe and extend TGL Wa_16013835468 to support ADLP, MTL and DG2 and all TGL steppings.
BSpec: 54369, 55378, 66624
v3:
- commit message modified
v2:
- apply for PSR1 as well
- remove stepping information from comments
--- drivers/gpu/drm/i915/display/intel_psr.c | 48 ++++++++++++++---------- drivers/gpu/drm/i915/i915_reg.h | 1 + 2 files changed, 29 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/display/intel_psr.c +28 -20
@@ -1112,6 +1112,8 @@ static u32 wa_16013835468_bit_get(struct intel_dp *intel_dp)return LATENCY_REPORTING_REMOVED_PIPE_B ;case PIPE_C :return LATENCY_REPORTING_REMOVED_PIPE_C ; +case PIPE_D : +return LATENCY_REPORTING_REMOVED_PIPE_D ;default :MISSING_CASE (intel_dp->psr.pipe);return 0 ;
@@ -1163,6 +1165,23 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp, intel_dp->psr.psr2_sel_fetch_enabled ? IGNORE_PSR2_HW_TRACKING : 0); +/* +* Wa_16013835468 +* Wa_14015648006 +*/ +if (IS_MTL_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_B0 ) || +IS_DISPLAY_VER (dev_priv,12 ,13 )) { +u16 vtotal, vblank; + + vtotal = crtc_state->uapi.adjusted_mode.crtc_vtotal - + crtc_state->uapi.adjusted_mode.crtc_vdisplay; + vblank = crtc_state->uapi.adjusted_mode.crtc_vblank_end - + crtc_state->uapi.adjusted_mode.crtc_vblank_start; +if (vblank > vtotal) +intel_de_rmw (dev_priv,GEN8_CHICKEN_DCPR_1 ,0 , +wa_16013835468_bit_get (intel_dp)); + } +if (intel_dp->psr.psr2_enabled) {if (DISPLAY_VER (dev_priv) ==9 ) intel_de_rmw(dev_priv, CHICKEN_TRANS(cpu_transcoder), 0,
@@ -1196,20 +1215,6 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp,else if (IS_ALDERLAKE_P (dev_priv))intel_de_rmw (dev_priv,CLKGATE_DIS_MISC ,0 ,CLKGATE_DIS_MISC_DMASC_GATING_DIS ); - -/* Wa_16013835468:tgl[b0+], dg1 */ -if (IS_TGL_DISPLAY_STEP (dev_priv,STEP_B0 ,STEP_FOREVER ) || -IS_DG1 (dev_priv)) { -u16 vtotal, vblank; - - vtotal = crtc_state->uapi.adjusted_mode.crtc_vtotal - - crtc_state->uapi.adjusted_mode.crtc_vdisplay; - vblank = crtc_state->uapi.adjusted_mode.crtc_vblank_end - - crtc_state->uapi.adjusted_mode.crtc_vblank_start; -if (vblank > vtotal) -intel_de_rmw (dev_priv,GEN8_CHICKEN_DCPR_1 ,0 , -wa_16013835468_bit_get (intel_dp)); - } } }
@@ -1362,6 +1367,15 @@ 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_16013835468 +* Wa_14015648006 +*/ +if (IS_MTL_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_B0 ) || +IS_DISPLAY_VER (dev_priv,12 ,13 )) +intel_de_rmw (dev_priv,GEN8_CHICKEN_DCPR_1 , +wa_16013835468_bit_get (intel_dp),0 ); +if (intel_dp->psr.psr2_enabled) {/* Wa_16011168373:adl-p */ if (IS_ADLP_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_B0 ))
@@ -1377,12 +1391,6 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)else if (IS_ALDERLAKE_P (dev_priv))intel_de_rmw (dev_priv,CLKGATE_DIS_MISC ,CLKGATE_DIS_MISC_DMASC_GATING_DIS ,0 ); - -/* Wa_16013835468:tgl[b0+], dg1 */ -if (IS_TGL_DISPLAY_STEP (dev_priv,STEP_B0 ,STEP_FOREVER ) || -IS_DG1 (dev_priv)) -intel_de_rmw (dev_priv,GEN8_CHICKEN_DCPR_1 , -wa_16013835468_bit_get (intel_dp),0 ); }intel_snps_phy_update_psr_power_state (dev_priv, phy, false);
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -5737,6 +5737,7 @@#define RESET_PCH_HANDSHAKE_ENABLE REG_BIT(4)#define GEN8_CHICKEN_DCPR_1 _MMIO(0x46430) +#define LATENCY_REPORTING_REMOVED_PIPE_D REG_BIT(31)#define SKL_SELECT_ALTERNATE_DC_EXIT REG_BIT(30)#define LATENCY_REPORTING_REMOVED_PIPE_C REG_BIT(25)#define LATENCY_REPORTING_REMOVED_PIPE_B REG_BIT(24)
Signature · 1 line
2.34.1
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/psr: Implement Wa_14015648006
== Series Details ==
== Series Details ==
Series: drm/i915/psr: Implement Wa_14015648006
URL : https://patchwork.freedesktop.org/series/112430/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_12548 -> Patchwork_112430v1
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_112430v1 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_112430v1, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112430v1/index.html
Participating hosts (43 -> 43)
------------------------------
Additional (1): bat-dg2-11
Missing (1): fi-snb-2520m
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_112430v1:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live@slpc:
- fi-kbl-soraka: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12548/fi-kbl-soraka/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112430v1/fi-kbl-soraka/igt@i915_selftest@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@i915_selftest@live@gt_heartbeat:
- {bat-kbl-2}: [PASS][3] -> [DMESG-FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12548/bat-kbl-2/igt@i915_selftest@live@gt_heartbeat.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112430v1/bat-kbl-2/igt@i915_selftest@live@gt_heartbeat.html
Known issues
------------
Here are the changes found in Patchwork_112430v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@fbdev@eof:
- fi-kbl-soraka: [PASS][5] -> [DMESG-WARN][6] ([i915#1982])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12548/fi-kbl-soraka/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112430v1/fi-kbl-soraka/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions-varying-size:
- fi-bsw-n3050: [PASS][7] -> [FAIL][8] ([i915#6298])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12548/fi-bsw-n3050/igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions-varying-size.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112430v1/fi-bsw-n3050/igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions-varying-size.html
#### Possible fixes ####
* igt@i915_selftest@live@migrate:
- {bat-adlp-9}: [DMESG-FAIL][9] ([i915#7699]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12548/bat-adlp-9/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112430v1/bat-adlp-9/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@mman:
- fi-rkl-guc: [TIMEOUT][11] ([i915#6794]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12548/fi-rkl-guc/igt@i915_selftest@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112430v1/fi-rkl-guc/igt@i915_selftest@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213
[i915#4215]: https://gitlab.freedesktop.org/drm/intel/issues/4215
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4873]: https://gitlab.freedesktop.org/drm/intel/issues/4873
[i915#5190]: https://gitlab.freedesktop.org/drm/intel/issues/5190
[i915#5274]: https://gitlab.freedesktop.org/drm/intel/issues/5274
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#6298]: https://gitlab.freedesktop.org/drm/intel/issues/6298
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#6794]: https://gitlab.freedesktop.org/drm/intel/issues/6794
[i915#6997]: https://gitlab.freedesktop.org/drm/intel/issues/6997
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7699]: https://gitlab.freedesktop.org/drm/intel/issues/7699
Build changes
-------------
* Linux: CI_DRM_12548 -> Patchwork_112430v1
CI-20190529: 20190529
CI_DRM_12548: 6e2f76c3e3ff7aa7be8812900b4b3bf13c056ed0 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7110: db10a19b94d1d7ae5ba62eb48d52c47ccb27766f @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_112430v1: 6e2f76c3e3ff7aa7be8812900b4b3bf13c056ed0 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
077b86a9a3d0 drm/i915/psr: Implement Wa_14015648006
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112430v1/index.html