drm/i915/display: Implement Wa_14015648006
Subsystems (3)
PATCH 1/1 drm/i915/display: 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
--- drivers/gpu/drm/i915/display/intel_psr.c | 20 ++++++++++++++------ drivers/gpu/drm/i915/i915_reg.h | 1 + 2 files changed, 15 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_psr.c +14 -6
@@ -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 ;
@@ -1197,9 +1199,12 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp,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)) { +/* +* Wa_16013835468:tgl[b0+], dg1, +* Wa_14015648006:adlp[a0+], mtl[a0], dg2, tgl[a0+] +*/ +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 -
@@ -1378,9 +1383,12 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)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)) +/* +* Wa_16013835468:tgl[b0+], dg1, +* Wa_14015648006:adlp[a0+], mtl[a0], dg2, tgl[a0+] +*/ +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 ); }
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: success for drm/i915/display: Implement Wa_14015648006 (rev2)
== Series Details ==
== Series Details ==
Series: drm/i915/display: Implement Wa_14015648006 (rev2)
URL : https://patchwork.freedesktop.org/series/103518/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12521 -> Patchwork_103518v2
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/index.html
Participating hosts (46 -> 46)
------------------------------
No changes in participating hosts
Known issues
------------
Here are the changes found in Patchwork_103518v2 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_gttfill@basic:
- fi-pnv-d510: [PASS][1] -> [FAIL][2] ([i915#7229])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/fi-pnv-d510/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/fi-pnv-d510/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions-varying-size:
- fi-bsw-kefka: [PASS][3] -> [FAIL][4] ([i915#6298])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions-varying-size.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions-varying-size.html
#### Possible fixes ####
* igt@fbdev@write:
- fi-blb-e6850: [SKIP][5] ([fdo#109271]) -> [PASS][6] +4 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/fi-blb-e6850/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/fi-blb-e6850/igt@[email protected]
* igt@i915_selftest@live@slpc:
- {bat-rpls-1}: [DMESG-FAIL][7] ([i915#6367]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/bat-rpls-1/igt@i915_selftest@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/bat-rpls-1/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#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#5153]: https://gitlab.freedesktop.org/drm/intel/issues/5153
[i915#6106]: https://gitlab.freedesktop.org/drm/intel/issues/6106
[i915#6257]: https://gitlab.freedesktop.org/drm/intel/issues/6257
[i915#6298]: https://gitlab.freedesktop.org/drm/intel/issues/6298
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#7229]: https://gitlab.freedesktop.org/drm/intel/issues/7229
[i915#7351]: https://gitlab.freedesktop.org/drm/intel/issues/7351
[i915#7699]: https://gitlab.freedesktop.org/drm/intel/issues/7699
Build changes
-------------
* Linux: CI_DRM_12521 -> Patchwork_103518v2
CI-20190529: 20190529
CI_DRM_12521: 584eb294ab7b1273c5ef505a33f2a5d89c877fcd @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7101: bd33b4c060eb6b2e24c5784b2aa817ae5840f84f @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_103518v2: 584eb294ab7b1273c5ef505a33f2a5d89c877fcd @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
ea0917b07483 drm/i915/display: Implement Wa_14015648006
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/index.html
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/display: Implement Wa_14015648006 (rev2)
In reply to Jouni Högander== Series Details ==
== Series Details ==
Series: drm/i915/display: Implement Wa_14015648006 (rev2)
URL : https://patchwork.freedesktop.org/series/103518/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12521_full -> Patchwork_103518v2_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/index.html
Participating hosts (13 -> 10)
------------------------------
Missing (3): pig-skl-6260u pig-kbl-iris pig-glk-j5005
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_103518v2_full:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-25:
- {shard-tglu}: NOTRUN -> [SKIP][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/shard-tglu-6/igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-25.html
Known issues
------------
Here are the changes found in Patchwork_103518v2_full that come from known issues:
### IGT changes ###
#### Possible fixes ####
* igt@fbdev@info:
- {shard-rkl}: [SKIP][2] ([i915#2582]) -> [PASS][3]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/shard-rkl-2/igt@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/shard-rkl-6/igt@[email protected]
* igt@feature_discovery@psr2:
- {shard-rkl}: [SKIP][4] ([i915#658]) -> [PASS][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/shard-rkl-3/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/shard-rkl-6/igt@[email protected]
* igt@gem_ctx_persistence@legacy-engines-hang@blt:
- {shard-rkl}: [SKIP][6] ([i915#6252]) -> [PASS][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/shard-rkl-5/igt@gem_ctx_persistence@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/shard-rkl-2/igt@gem_ctx_persistence@[email protected]
* igt@gem_exec_reloc@basic-write-read-active:
- {shard-rkl}: [SKIP][8] ([i915#3281]) -> [PASS][9] +7 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/shard-rkl-1/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/shard-rkl-5/igt@[email protected]
* igt@gem_mmap_gtt@coherency:
- {shard-rkl}: [SKIP][10] ([fdo#111656]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/shard-rkl-1/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/shard-rkl-5/igt@[email protected]
* igt@gem_partial_pwrite_pread@write-uncached:
- {shard-rkl}: [SKIP][12] ([i915#3282]) -> [PASS][13] +2 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/shard-rkl-1/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/shard-rkl-5/igt@[email protected]
* igt@gen9_exec_parse@allowed-all:
- shard-glk: [DMESG-WARN][14] ([i915#5566] / [i915#716]) -> [PASS][15]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/shard-glk6/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/shard-glk1/igt@[email protected]
* igt@gen9_exec_parse@basic-rejected:
- {shard-rkl}: [SKIP][16] ([i915#2527]) -> [PASS][17] +1 similar issue
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/shard-rkl-1/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/shard-rkl-5/igt@[email protected]
* igt@i915_hangman@engine-engine-error@bcs0:
- {shard-rkl}: [SKIP][18] ([i915#6258]) -> [PASS][19]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/shard-rkl-5/igt@i915_hangman@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/shard-rkl-1/igt@i915_hangman@[email protected]
* igt@i915_pm_rpm@system-suspend-modeset:
- {shard-rkl}: [SKIP][20] ([fdo#109308]) -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/shard-rkl-3/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/shard-rkl-6/igt@[email protected]
* igt@kms_async_flips@alternate-sync-async-flip@pipe-a-hdmi-a-1:
- shard-glk: [FAIL][22] ([i915#2521]) -> [PASS][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/shard-glk9/igt@kms_async_flips@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/shard-glk7/igt@kms_async_flips@[email protected]
* igt@kms_ccs@pipe-b-bad-aux-stride-y_tiled_gen12_rc_ccs:
- {shard-rkl}: [SKIP][24] ([i915#1845] / [i915#4098]) -> [PASS][25] +11 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/shard-rkl-3/igt@kms_ccs@pipe-b-bad-aux-stride-y_tiled_gen12_rc_ccs.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/shard-rkl-6/igt@kms_ccs@pipe-b-bad-aux-stride-y_tiled_gen12_rc_ccs.html
* igt@kms_color@legacy-gamma@pipe-d-hdmi-a-4:
- {shard-dg1}: [FAIL][26] -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/shard-dg1-15/igt@kms_color@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/shard-dg1-18/igt@kms_color@[email protected]
* igt@kms_flip@2x-plain-flip-ts-check-interruptible@ac-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][28] ([i915#2122]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/shard-glk8/igt@kms_flip@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/shard-glk5/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@psr-modesetfrombusy:
- {shard-rkl}: [SKIP][30] ([i915#1849] / [i915#4098]) -> [PASS][31] +14 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/shard-rkl-2/igt@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/shard-rkl-6/igt@[email protected]
* igt@kms_psr@sprite_render:
- {shard-rkl}: [SKIP][32] ([i915#1072]) -> [PASS][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/shard-rkl-3/igt@kms_psr@sprite_render.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/shard-rkl-6/igt@kms_psr@sprite_render.html
* igt@kms_universal_plane@disable-primary-vs-flip-pipe-a:
- {shard-rkl}: [SKIP][34] ([i915#1845] / [i915#4070] / [i915#4098]) -> [PASS][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/shard-rkl-2/igt@[email protected]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/shard-rkl-6/igt@[email protected]
* igt@testdisplay:
- {shard-rkl}: [SKIP][36] ([i915#4098]) -> [PASS][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12521/shard-rkl-2/[email protected]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/shard-rkl-6/[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109279]: https://bugs.freedesktop.org/show_bug.cgi?id=109279
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109302]: https://bugs.freedesktop.org/show_bug.cgi?id=109302
[fdo#109303]: https://bugs.freedesktop.org/show_bug.cgi?id=109303
[fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308
[fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312
[fdo#109313]: https://bugs.freedesktop.org/show_bug.cgi?id=109313
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111644]: https://bugs.freedesktop.org/show_bug.cgi?id=111644
[fdo#111656]: https://bugs.freedesktop.org/show_bug.cgi?id=111656
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112054]: https://bugs.freedesktop.org/show_bug.cgi?id=112054
[fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#132]: https://gitlab.freedesktop.org/drm/intel/issues/132
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1769]: https://gitlab.freedesktop.org/drm/intel/issues/1769
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3002]: https://gitlab.freedesktop.org/drm/intel/issues/3002
[i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116
[i915#315]: https://gitlab.freedesktop.org/drm/intel/issues/315
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3528]: https://gitlab.freedesktop.org/drm/intel/issues/3528
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3547]: https://gitlab.freedesktop.org/drm/intel/issues/3547
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3558]: https://gitlab.freedesktop.org/drm/intel/issues/3558
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3804]: https://gitlab.freedesktop.org/drm/intel/issues/3804
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#3966]: https://gitlab.freedesktop.org/drm/intel/issues/3966
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4275]: https://gitlab.freedesktop.org/drm/intel/issues/4275
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4387]: https://gitlab.freedesktop.org/drm/intel/issues/4387
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4767]: https://gitlab.freedesktop.org/drm/intel/issues/4767
[i915#4991]: https://gitlab.freedesktop.org/drm/intel/issues/4991
[i915#5122]: https://gitlab.freedesktop.org/drm/intel/issues/5122
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5288]: https://gitlab.freedesktop.org/drm/intel/issues/5288
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#5327]: https://gitlab.freedesktop.org/drm/intel/issues/5327
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439
[i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6227]: https://gitlab.freedesktop.org/drm/intel/issues/6227
[i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248
[i915#6252]: https://gitlab.freedesktop.org/drm/intel/issues/6252
[i915#6258]: https://gitlab.freedesktop.org/drm/intel/issues/6258
[i915#6259]: https://gitlab.freedesktop.org/drm/intel/issues/6259
[i915#6334]: https://gitlab.freedesktop.org/drm/intel/issues/6334
[i915#6335]: https://gitlab.freedesktop.org/drm/intel/issues/6335
[i915#6355]: https://gitlab.freedesktop.org/drm/intel/issues/6355
[i915#6412]: https://gitlab.freedesktop.org/drm/intel/issues/6412
[i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433
[i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[i915#6946]: https://gitlab.freedesktop.org/drm/intel/issues/6946
[i915#7037]: https://gitlab.freedesktop.org/drm/intel/issues/7037
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7651]: https://gitlab.freedesktop.org/drm/intel/issues/7651
[i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697
[i915#7707]: https://gitlab.freedesktop.org/drm/intel/issues/7707
Build changes
-------------
* Linux: CI_DRM_12521 -> Patchwork_103518v2
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_12521: 584eb294ab7b1273c5ef505a33f2a5d89c877fcd @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7101: bd33b4c060eb6b2e24c5784b2aa817ae5840f84f @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_103518v2: 584eb294ab7b1273c5ef505a33f2a5d89c877fcd @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_103518v2/index.html
Quoted 32 lines · Jouni Högander
Add 4th pipe and extend TGL
Wa_16013835468to support ADLP, MTL and DG2 and all TGL steppings.BSpec: 54369, 55378, 66624
Cc Matt Roper <[email protected]>Cc José Roberto de Souza <[email protected]>Cc Stanislav Lisovskiy <[email protected]>Signed-off-by Mika Kahola <[email protected]>Signed-off-by Jouni Högander <[email protected]>--- drivers/gpu/drm/i915/display/intel_psr.c | 20 ++++++++++++++------ drivers/gpu/drm/i915/i915_reg.h | 1 + 2 files changed, 15 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/display/intel_psr.c +2
-0@@ -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 ;@@ -1197,9 +1199,12 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp,intel_de_rmw (dev_priv,CLKGATE_DIS_MISC ,0 ,CLKGATE_DIS_MISC_DMASC_GATING_DIS );
drivers/gpu/drm/i915/display/intel_psr.c static void intel_psr_enable_source(struct intel_dp *intel_dp, · line 1207
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_psr.c +6
-3-/* Wa_16013835468:tgl[b0+], dg1 */ -if (IS_TGL_DISPLAY_STEP (dev_priv,STEP_B0 ,STEP_FOREVER ) || -IS_DG1 (dev_priv)) { +/* +* Wa_16013835468:tgl[b0+], dg1, +* Wa_14015648006:adlp[a0+], mtl[a0], dg2, tgl[a0+] +*/ +if (IS_MTL_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_B0 ) || +IS_DISPLAY_VER (dev_priv,12 ,13 )) {
There's another thread where we're discussing possibly dropping all of the platform/stepping information from workaround comments, but this is a great supporting example for why the detailed comments are causing more confusion than they're worth. The code condition includes RKL and ADL-S, whereas the comment does not mention them. In this case the code is correct and the comment is incomplete.
If we move forward with Lucas' patch, this should just turn into
/*
* Wa_16013835468
* Wa_14015648006
*/
and let the code speak for itself about which platform(s) it covers.
As for the workaround itself here, the existing implementation of Wa_16013835468 is in a 'if (intel_dp->psr.psr2_enabled)' but it looks like the description of the new Wa_14015648006 is also supposed to apply to PSR1 as well. Do we need to lift these out of that conditional block?
Matt
Quoted 34 lines
drivers/gpu/drm/i915/display/intel_psr.c +6
-3u16 vtotal, vblank; vtotal = crtc_state->uapi.adjusted_mode.crtc_vtotal -@@ -1378,9 +1383,12 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)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)) +/* +* Wa_16013835468:tgl[b0+], dg1, +* Wa_14015648006:adlp[a0+], mtl[a0], dg2, tgl[a0+] +*/ +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 ); }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
Signature · 4 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation
Quoted 71 lines · Matt Roper
Quoted 40 lines · Jouni Högander
Add 4th pipe and extend TGL
Wa_16013835468to support ADLP, MTL and DG2 and all TGL steppings.BSpec: 54369, 55378, 66624
Cc Matt Roper <[email protected]>Cc José Roberto de Souza <[email protected]>Cc Stanislav Lisovskiy <[email protected]>Signed-off-by Mika Kahola <[email protected]>Signed-off-by Jouni Högander <[email protected]>---
drivers/gpu/drm/i915/display/intel_psr.c | 20 ++++++++++++++------ drivers/gpu/drm/i915/i915_reg.h | 1 +2 files changed, 15 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/display/intel_psr.c +0
-0@@ -1112,6 +1112,8 @@ static u32 wa_16013835468_bit_get(struct intel_dp *intel_dp) return LATENCY_REPORTING_REMOVED_PIPE_B;case
PIPE_C:
returnLATENCY_REPORTING_REMOVED_PIPE_C; + casePIPE_D:
+ returnLATENCY_REPORTING_REMOVED_PIPE_D; default:
MISSING_CASE(intel_dp->psr.pipe); return 0;drivers/gpu/drm/i915/display/intel_psr.c +0
-0@@ -1197,9 +1199,12 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp, 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)||Quoted 8 lines
-
IS_DG1(dev_priv)) {
+ /*
+ * Wa_16013835468:tgl[b0+], dg1,
+ * Wa_14015648006:adlp[a0+], mtl[a0], dg2, tgl[a0+] + */
+ if (IS_MTL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0)||
+IS_DISPLAY_VER(dev_priv, 12, 13)) {There's another thread where we're discussing possibly dropping all of
the platform/stepping information from workaround comments, but this is
a great supporting example for why the detailed comments are causing more confusion than they're worth. The code condition includes RKL and
ADL-S, whereas the comment does not mention them. In this case the code
is correct and the comment is incomplete.If we move forward with Lucas' patch, this should just turn into
/*
*Wa_16013835468
*Wa_14015648006
*/and let the code speak for itself about which platform(s) it covers.
Quoted 6 lines
As for the workaround itself here, the existing implementation of
Wa_16013835468is in a 'if (intel_dp->psr.psr2_enabled)' but it looks like the description of the newWa_14015648006is also supposed to apply
to PSR1 as well. Do we need to lift these out of that conditional block?
You are right. It should be applied for PSR1 as well.
Thank you for all your comments. Addressed all of them in new version. Please check.
Quoted 46 lines
Matt
Quoted 41 lines
u16 vtotal, vblank;
vtotal = crtc_state-Quoted 1 line
uapi.adjusted_mode.crtc_vtotal -
drivers/gpu/drm/i915/display/intel_psr.c +0
-0@@ -1378,9 +1383,12 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp) 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))
+ /*
+ * Wa_16013835468:tgl[b0+], dg1,
+ * Wa_14015648006:adlp[a0+], mtl[a0], dg2, tgl[a0+] + */
+ 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);
}drivers/gpu/drm/i915/i915_reg.h +0
-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