drm/i915/tgl: Fix stepping WA matching
Subsystems (3)
PATCH 1/1 drm/i915/tgl: Fix stepping WA matching
TGL made stepping a litte mess, workarounds refer to the stepping of the IP(GT or Display) not of the GPU stepping so it would already require the same solution as used in commit 96c5a15f9f39 ("drm/i915/kbl: Fix revision ID checks").
But to make things even more messy it have a different IP stepping mapping between SKUs and the same stepping revision of GT do not match the same HW between TGL U/Y and regular TGL.
So it was required to have 2 different macros to check GT WAs while for Display we are able to use just one macro that uses the right revids table.
All TGL workarounds checked and updated accordingly.
BSpec: 52890
BSpec: 55378
BSpec: 44455
--- .../drm/i915/display/intel_display_power.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 4 +- drivers/gpu/drm/i915/display/intel_sprite.c | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 24 ++++++++++-- drivers/gpu/drm/i915/i915_drv.h | 39 ++++++++++++++++--- drivers/gpu/drm/i915/intel_pm.c | 2 +- 6 files changed, 59 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power.c +1 -1
@@ -5263,7 +5263,7 @@ static void tgl_bw_buddy_init(struct drm_i915_private *dev_priv)unsigned long abox_mask =INTEL_INFO (dev_priv)->abox_mask;int config, i; -if (IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_B0 )) +if (IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_B0 ))/* Wa_1409767108: tgl */ table = wa_1409767108_buddy_page_masks;else
drivers/gpu/drm/i915/display/intel_psr.c +2 -2
@@ -555,7 +555,7 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp)if (dev_priv->psr.psr2_sel_fetch_enabled) {/* WA 1408330847 */ -if (IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_A0 ) || +if (IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_A0 ) ||IS_RKL_REVID (dev_priv,RKL_REVID_A0 ,RKL_REVID_A0 )) intel_de_rmw(dev_priv, CHICKEN_PAR1_1, DIS_RAM_BYPASS_PSR2_MAN_TRACK,
@@ -1109,7 +1109,7 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)/* WA 1408330847 */ if (dev_priv->psr.psr2_sel_fetch_enabled && - (IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_A0 ) || + (IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_A0 ) ||IS_RKL_REVID (dev_priv,RKL_REVID_A0 ,RKL_REVID_A0 )))intel_de_rmw (dev_priv,CHICKEN_PAR1_1 ,DIS_RAM_BYPASS_PSR2_MAN_TRACK ,0 );
drivers/gpu/drm/i915/display/intel_sprite.c +1 -1
@@ -2845,7 +2845,7 @@ static bool gen12_plane_supports_mc_ccs(struct drm_i915_private *dev_priv, {/* Wa_14010477008:tgl[a0..c0],rkl[all] */ if (IS_ROCKETLAKE (dev_priv) || -IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_C0 )) +IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_C0 ))return false;return plane_id <PLANE_SPRITE4 ;
drivers/gpu/drm/i915/gt/intel_workarounds.c +20 -4
@@ -70,6 +70,19 @@ const struct i915_rev_steppings kbl_revids[] = { [7] = { .gt_stepping = KBL_REVID_G0, .disp_stepping = KBL_REVID_C0 }, }; +const struct i915_rev_steppings tgl_uy_revids[] = { + [0 ] = { .gt_stepping =TGL_REVID_A0 , .disp_stepping =TGL_REVID_A0 }, + [1 ] = { .gt_stepping =TGL_REVID_B0 , .disp_stepping =TGL_REVID_C0 }, + [2 ] = { .gt_stepping =TGL_REVID_B1 , .disp_stepping =TGL_REVID_C0 }, + [3 ] = { .gt_stepping =TGL_REVID_C0 , .disp_stepping =TGL_REVID_D0 }, +}; + +/* Same GT stepping between tgl_uy_revids and tgl_revids don't mean the same HW */ +const struct i915_rev_steppings tgl_revids[] = { + [0 ] = { .gt_stepping =TGL_REVID_A0 , .disp_stepping =TGL_REVID_A0 }, + [1 ] = { .gt_stepping =TGL_REVID_B0 , .disp_stepping =TGL_REVID_D0 }, +}; +static void wa_init_start (struct i915_wa_list *wal,const char *name,const char *engine_name) { wal->name = name;
@@ -1219,13 +1232,13 @@ tgl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)gen12_gt_workarounds_init (i915, wal);/* Wa_1409420604:tgl */ -if (IS_TGL_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 )) +if (IS_TGL_UY_GT_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 ))wa_write_or (wal,SUBSLICE_UNIT_LEVEL_CLKGATE2 ,CPSSUNIT_CLKGATE_DIS );/* Wa_1607087056:tgl also know as BUG:1409180338 */ -if (IS_TGL_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 )) +if (IS_TGL_UY_GT_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 ))wa_write_or (wal,SLICE_UNIT_LEVEL_CLKGATE ,L3_CLKGATE_DIS |L3_CR2X_CLKGATE_DIS );
@@ -1660,7 +1673,7 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) {struct drm_i915_private *i915 = engine->i915; -if (IS_TGL_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 )) { +if (IS_TGL_UY_GT_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 )) {/* * Wa_1607138336:tgl * Wa_1607063988:tgl
@@ -1697,6 +1710,9 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal)wa_masked_en (wal,GEN9_ROW_CHICKEN4 ,GEN12_DISABLE_TDL_PUSH );/* +* TODO: still pending the decision if this WA is permanent for +* plain TGL SKU(not TGL-U/Y). +* * Wa_1407928979:tgl A* * Wa_18011464164:tgl B0+ * Wa_22010931296:tgl B0+
@@ -1718,7 +1734,7 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) GEN8_RC_SEMA_IDLE_MSG_DISABLE); } -if (IS_TIGERLAKE (i915)) { +if (IS_TGL_U (i915) ||IS_TGL_Y (i915)) {/* Wa_1606700617:tgl */ wa_masked_en(wal, GEN9_CS_DEBUG_MODE1,
drivers/gpu/drm/i915/i915_drv.h +34 -5
@@ -1572,12 +1572,41 @@ extern const struct i915_rev_steppings kbl_revids[];#define IS_EHL_REVID (p, since, until) \ (IS_ELKHARTLAKE(p) && IS_REVID(p, since, until)) -#define TGL_REVID_A0 0x0 -#define TGL_REVID_B0 0x1 -#define TGL_REVID_C0 0x2 +enum { +TGL_REVID_A0 , +TGL_REVID_B0 , +TGL_REVID_B1 , +TGL_REVID_C0 , +TGL_REVID_D0 , +}; + +extern const struct i915_rev_steppings tgl_uy_revids[]; +extern const struct i915_rev_steppings tgl_revids[]; + +static inline const struct i915_rev_steppings * +tgl_revids_get (struct drm_i915_private *dev_priv) +{ +if (IS_TGL_U (dev_priv) ||IS_TGL_Y (dev_priv)) +return tgl_uy_revids; +else +return tgl_revids; +} -#define IS_TGL_REVID (p, since, until) \ - (IS_TIGERLAKE(p) && IS_REVID(p, since, until)) +#define IS_TGL_DISP_REVID (p, since, until) \ + (IS_TIGERLAKE(p) && \ + tgl_revids_get(p)->disp_stepping >= (since) && \ + tgl_revids_get(p)->disp_stepping <= (until)) + +#define IS_TGL_UY_GT_REVID (p, since, until) \ + ((IS_TGL_U(p) || IS_TGL_Y(p)) && \ + tgl_uy_revids->gt_stepping >= (since) && \ + tgl_uy_revids->gt_stepping <= (until)) + +#define IS_TGL_GT_REVID (p, since, until) \ + (IS_TIGERLAKE(p) && \ + !(IS_TGL_U(p) || IS_TGL_Y(p)) && \ + tgl_revids->gt_stepping >= (since) && \ + tgl_revids->gt_stepping <= (until))#define RKL_REVID_A0 0x0#define RKL_REVID_B0 0x1
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -7136,7 +7136,7 @@ static void tgl_init_clock_gating(struct drm_i915_private *dev_priv) I915_READ(POWERGATE_ENABLE) | vd_pg_enable);/* Wa_1409825376:tgl (pre-prod)*/ -if (IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_A0 )) +if (IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_B1 ))I915_WRITE (GEN9_CLKGATE_DIS_3 ,I915_READ (GEN9_CLKGATE_DIS_3 ) |TGL_VRH_GATING_DIS );
Signature · 6 lines
2.28.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/tgl: Fix stepping WA matching
== Series Details ==
== Series Details ==
Series: drm/i915/tgl: Fix stepping WA matching
URL : https://patchwork.freedesktop.org/series/80820/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 0a625a7a4c3e drm/i915/tgl: Fix stepping WA matching -:180: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'p' - possible side-effects? #180: FILE: drivers/gpu/drm/i915/i915_drv.h:1595: +#define IS_TGL_DISP_REVID(p, since, until) \ + (IS_TIGERLAKE(p) && \ + tgl_revids_get(p)->disp_stepping >= (since) && \ + tgl_revids_get(p)->disp_stepping <= (until))
-:185: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'p' - possible side-effects? #185: FILE: drivers/gpu/drm/i915/i915_drv.h:1600:
+#define IS_TGL_UY_GT_REVID(p, since, until) \
+ ((IS_TGL_U(p) || IS_TGL_Y(p)) && \
+ tgl_uy_revids->gt_stepping >= (since) && \
+ tgl_uy_revids->gt_stepping <= (until))
-:190: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'p' - possible side-effects? #190: FILE: drivers/gpu/drm/i915/i915_drv.h:1605:
+#define IS_TGL_GT_REVID(p, since, until) \
+ (IS_TIGERLAKE(p) && \
+ !(IS_TGL_U(p) || IS_TGL_Y(p)) && \
+ tgl_revids->gt_stepping >= (since) && \
+ tgl_revids->gt_stepping <= (until))
total: 0 errors, 0 warnings, 3 checks, 145 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/tgl: Fix stepping WA matching
In reply to José Roberto de Souza== Series Details ==
== Series Details ==
Series: drm/i915/tgl: Fix stepping WA matching
URL : https://patchwork.freedesktop.org/series/80820/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8908 -> Patchwork_18379
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/index.html
Known issues
------------
Here are the changes found in Patchwork_18379 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_module_load@reload:
- fi-apl-guc: [PASS][1] -> [DMESG-WARN][2] ([i915#1635] / [i915#1982])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/fi-apl-guc/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/fi-apl-guc/igt@[email protected]
- fi-tgl-u2: [PASS][3] -> [DMESG-WARN][4] ([i915#1982])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/fi-tgl-u2/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/fi-tgl-u2/igt@[email protected]
* igt@i915_selftest@live@execlists:
- fi-icl-y: [PASS][5] -> [INCOMPLETE][6] ([i915#2276])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/fi-icl-y/igt@i915_selftest@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/fi-icl-y/igt@i915_selftest@[email protected]
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7500u: [PASS][7] -> [DMESG-WARN][8] ([i915#2203])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/fi-kbl-7500u/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/fi-kbl-7500u/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-bsw-n3050: [PASS][9] -> [DMESG-WARN][10] ([i915#1982])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/fi-bsw-n3050/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/fi-bsw-n3050/igt@[email protected]
#### Warnings ####
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-kbl-guc: [SKIP][11] ([fdo#109271]) -> [DMESG-FAIL][12] ([i915#2203])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/fi-kbl-guc/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/fi-kbl-guc/igt@[email protected]
* igt@kms_cursor_legacy@basic-flip-after-cursor-varying-size:
- fi-kbl-x1275: [DMESG-WARN][13] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][14] ([i915#62] / [i915#92]) +2 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/fi-kbl-x1275/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/fi-kbl-x1275/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- fi-kbl-x1275: [DMESG-WARN][15] ([i915#62] / [i915#92]) -> [DMESG-WARN][16] ([i915#62] / [i915#92] / [i915#95]) +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/fi-kbl-x1275/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/fi-kbl-x1275/igt@[email protected]
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2203]: https://gitlab.freedesktop.org/drm/intel/issues/2203
[i915#2276]: https://gitlab.freedesktop.org/drm/intel/issues/2276
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (39 -> 34)
------------------------------
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper
Build changes
-------------
* Linux: CI_DRM_8908 -> Patchwork_18379
CI-20190529: 20190529
CI_DRM_8908: 03a59fdcea84502e199bf7fa55fd117dcd161dab @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5769: 4e5f76be680b65780204668e302026cf638decc9 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18379: 0a625a7a4c3edec7a1bc3a51534867dc4e062753 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
0a625a7a4c3e drm/i915/tgl: Fix stepping WA matching
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/tgl: Fix stepping WA matching
In reply to José Roberto de Souza== Series Details ==
== Series Details ==
Series: drm/i915/tgl: Fix stepping WA matching
URL : https://patchwork.freedesktop.org/series/80820/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8908_full -> Patchwork_18379_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_18379_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [PASS][1] -> [FAIL][2] ([i915#454])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-iclb7/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-iclb6/igt@[email protected]
* igt@i915_query@query-topology-coherent-slice-mask:
- shard-iclb: [PASS][3] -> [DMESG-WARN][4] ([i915#1982])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-iclb6/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-iclb4/igt@[email protected]
* igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@ab-vga1-hdmi-a1:
- shard-hsw: [PASS][5] -> [DMESG-WARN][6] ([i915#1982])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-hsw7/igt@kms_flip@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-hsw8/igt@kms_flip@[email protected]
* igt@kms_flip@2x-wf_vblank-ts-check-interruptible@ab-hdmi-a1-hdmi-a2:
- shard-glk: [PASS][7] -> [DMESG-WARN][8] ([i915#1982]) +2 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-glk7/igt@kms_flip@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-glk6/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-absolute-wf_vblank-interruptible@a-edp1:
- shard-skl: [PASS][9] -> [FAIL][10] ([i915#2122])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-skl6/igt@kms_flip@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-skl7/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-fences@a-edp1:
- shard-skl: [PASS][11] -> [DMESG-WARN][12] ([i915#1982]) +8 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-skl6/igt@kms_flip@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-skl1/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:
- shard-kbl: [PASS][13] -> [DMESG-WARN][14] ([i915#180]) +7 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-kbl2/igt@kms_flip@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-kbl7/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-blt:
- shard-kbl: [PASS][15] -> [DMESG-WARN][16] ([i915#1982])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-kbl2/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-kbl1/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-mmap-cpu:
- shard-tglb: [PASS][17] -> [DMESG-WARN][18] ([i915#1982]) +3 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-tglb7/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-tglb1/igt@[email protected]
* igt@kms_hdr@bpc-switch-suspend:
- shard-skl: [PASS][19] -> [FAIL][20] ([i915#1188])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-skl7/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-skl7/igt@[email protected]
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [PASS][21] -> [SKIP][22] ([fdo#109441]) +2 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-iclb8/igt@kms_psr@psr2_sprite_plane_move.html
* igt@kms_setmode@basic:
- shard-hsw: [PASS][23] -> [FAIL][24] ([i915#31])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-hsw7/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-hsw2/igt@[email protected]
* igt@sysfs_heartbeat_interval@precise@vecs0:
- shard-iclb: [PASS][25] -> [FAIL][26] ([i915#1755])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-iclb3/igt@sysfs_heartbeat_interval@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-iclb5/igt@sysfs_heartbeat_interval@[email protected]
#### Possible fixes ####
* igt@i915_pm_rc6_residency@rc6-idle:
- shard-hsw: [WARN][27] ([i915#1519]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-hsw6/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-hsw4/igt@[email protected]
* igt@i915_selftest@mock@contexts:
- shard-skl: [INCOMPLETE][29] ([i915#198] / [i915#2278]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-skl8/igt@i915_selftest@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-skl3/igt@i915_selftest@[email protected]
- shard-apl: [INCOMPLETE][31] ([i915#1635] / [i915#2278]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-apl3/igt@i915_selftest@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-apl2/igt@i915_selftest@[email protected]
* igt@kms_addfb_basic@bo-too-small:
- shard-iclb: [DMESG-WARN][33] ([i915#1982]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-iclb2/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-iclb7/igt@[email protected]
* igt@kms_color@pipe-c-ctm-0-25:
- shard-skl: [DMESG-WARN][35] ([i915#1982]) -> [PASS][36] +12 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-skl9/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-skl4/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-kbl: [DMESG-WARN][37] ([i915#180]) -> [PASS][38] +6 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-kbl4/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-kbl2/igt@[email protected]
* igt@kms_cursor_legacy@basic-flip-after-cursor-varying-size:
- shard-tglb: [DMESG-WARN][39] ([i915#1982]) -> [PASS][40] +2 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-tglb8/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-tglb3/igt@[email protected]
* igt@kms_draw_crc@draw-method-rgb565-mmap-cpu-untiled:
- shard-skl: [FAIL][41] ([i915#52] / [i915#54]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-skl10/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-skl10/igt@[email protected]
* igt@kms_flip@plain-flip-fb-recreate@b-edp1:
- shard-skl: [FAIL][43] ([i915#2122]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-skl3/igt@kms_flip@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-skl6/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-kbl: [INCOMPLETE][45] ([i915#155]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-kbl2/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-kbl7/igt@[email protected]
* igt@kms_hdr@bpc-switch:
- shard-skl: [FAIL][47] ([i915#1188]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-skl4/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-skl9/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min:
- shard-skl: [FAIL][49] ([fdo#108145] / [i915#265]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-skl8/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-skl3/igt@[email protected]
* igt@kms_psr@psr2_sprite_blt:
- shard-iclb: [SKIP][51] ([fdo#109441]) -> [PASS][52] +2 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-iclb5/igt@kms_psr@psr2_sprite_blt.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-iclb2/igt@kms_psr@psr2_sprite_blt.html
* igt@kms_vblank@pipe-b-ts-continuation-modeset-rpm:
- shard-kbl: [DMESG-WARN][53] ([i915#165]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-kbl2/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-kbl1/igt@[email protected]
* igt@prime_busy@after@vecs0:
- shard-hsw: [FAIL][55] ([i915#2258]) -> [PASS][56] +1 similar issue
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-hsw7/igt@prime_busy@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-hsw2/igt@prime_busy@[email protected]
#### Warnings ####
* igt@gem_exec_reloc@basic-spin-others@vcs0:
- shard-snb: [WARN][57] ([i915#2036]) -> [WARN][58] ([i915#2021])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8908/shard-snb4/igt@gem_exec_reloc@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18379/shard-snb5/igt@gem_exec_reloc@[email protected]
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1519]: https://gitlab.freedesktop.org/drm/intel/issues/1519
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#165]: https://gitlab.freedesktop.org/drm/intel/issues/165
[i915#1755]: https://gitlab.freedesktop.org/drm/intel/issues/1755
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2021]: https://gitlab.freedesktop.org/drm/intel/issues/2021
[i915#2036]: https://gitlab.freedesktop.org/drm/intel/issues/2036
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2258]: https://gitlab.freedesktop.org/drm/intel/issues/2258
[i915#2278]: https://gitlab.freedesktop.org/drm/intel/issues/2278
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#52]: https://gitlab.freedesktop.org/drm/intel/issues/52
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
Participating hosts (11 -> 11)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_8908 -> Patchwork_18379
CI-20190529: 20190529
CI_DRM_8908: 03a59fdcea84502e199bf7fa55fd117dcd161dab @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5769: 4e5f76be680b65780204668e302026cf638decc9 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18379: 0a625a7a4c3edec7a1bc3a51534867dc4e062753 @ 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_18379/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 136 lines · José Roberto de Souza
TGL made stepping a litte mess, workarounds refer to the stepping of the IP(GT or Display) not of the GPU stepping so it would already require the same solution as used in commit
96c5a15f9f39("drm/i915/kbl: Fix revision ID checks").
But to make things even more messy it have a different IP stepping mapping between SKUs and the same stepping revision of GT do not match the same HW between TGL U/Y and regular TGL.So it was required to have 2 different macros to check GT WAs while for Display we are able to use just one macro that uses the right revids table.
All TGL workarounds checked and updated accordingly.
BSpec: 52890
BSpec: 55378
BSpec: 44455
Cc: Penne Lee <
[email protected]Quoted 1 line
Cc: Guangyao Bai <
[email protected]Quoted 1 line
Cc: Matt Roper <
[email protected]Quoted 1 line
Signed-off-by: José Roberto de Souza <
[email protected]Quoted 1 line
--- .../drm/i915/display/intel_display_power.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 4 +- drivers/gpu/drm/i915/display/intel_sprite.c | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 24 ++++++++++-- drivers/gpu/drm/i915/i915_drv.h | 39 ++++++++++++++++--- drivers/gpu/drm/i915/intel_pm.c | 2 +- 6 files changed, 59 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/display/intel_display_power.c +1
-1@@ -5263,7 +5263,7 @@ static void tgl_bw_buddy_init(struct drm_i915_private *dev_priv)unsigned long abox_mask =INTEL_INFO (dev_priv)->abox_mask;int config, i; -if (IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_B0 )) +if (IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_B0 ))/* Wa_1409767108: tgl */ table = wa_1409767108_buddy_page_masks;else drivers/gpu/drm/i915/display/intel_psr.c +2
-2@@ -555,7 +555,7 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp)if (dev_priv->psr.psr2_sel_fetch_enabled) {/* WA 1408330847 */ -if (IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_A0 ) || +if (IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_A0 ) ||IS_RKL_REVID (dev_priv,RKL_REVID_A0 ,RKL_REVID_A0 )) intel_de_rmw(dev_priv, CHICKEN_PAR1_1, DIS_RAM_BYPASS_PSR2_MAN_TRACK,@@ -1109,7 +1109,7 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)/* WA 1408330847 */ if (dev_priv->psr.psr2_sel_fetch_enabled && - (IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_A0 ) || + (IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_A0 ) ||IS_RKL_REVID (dev_priv,RKL_REVID_A0 ,RKL_REVID_A0 )))intel_de_rmw (dev_priv,CHICKEN_PAR1_1 ,DIS_RAM_BYPASS_PSR2_MAN_TRACK ,0 );drivers/gpu/drm/i915/display/intel_sprite.c +1
-1@@ -2845,7 +2845,7 @@ static bool gen12_plane_supports_mc_ccs(struct drm_i915_private *dev_priv, {/* Wa_14010477008:tgl[a0..c0],rkl[all] */ if (IS_ROCKETLAKE (dev_priv) || -IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_C0 )) +IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_C0 ))return false;return plane_id <PLANE_SPRITE4 ;drivers/gpu/drm/i915/gt/intel_workarounds.c +16
-3@@ -70,6 +70,19 @@ const struct i915_rev_steppings kbl_revids[] = { [7] = { .gt_stepping = KBL_REVID_G0, .disp_stepping = KBL_REVID_C0 }, }; +const struct i915_rev_steppings tgl_uy_revids[] = { + [0 ] = { .gt_stepping =TGL_REVID_A0 , .disp_stepping =TGL_REVID_A0 }, + [1 ] = { .gt_stepping =TGL_REVID_B0 , .disp_stepping =TGL_REVID_C0 }, + [2 ] = { .gt_stepping =TGL_REVID_B1 , .disp_stepping =TGL_REVID_C0 }, + [3 ] = { .gt_stepping =TGL_REVID_C0 , .disp_stepping =TGL_REVID_D0 }, +}; + +/* Same GT stepping between tgl_uy_revids and tgl_revids don't mean the same HW */ +const struct i915_rev_steppings tgl_revids[] = { + [0 ] = { .gt_stepping =TGL_REVID_A0 , .disp_stepping =TGL_REVID_A0 }, + [1 ] = { .gt_stepping =TGL_REVID_B0 , .disp_stepping =TGL_REVID_D0 }, +}; +static void wa_init_start (struct i915_wa_list *wal,const char *name,const char *engine_name) { wal->name = name;@@ -1219,13 +1232,13 @@ tgl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)gen12_gt_workarounds_init (i915, wal);/* Wa_1409420604:tgl */ -if (IS_TGL_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 )) +if (IS_TGL_UY_GT_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 ))wa_write_or (wal,SUBSLICE_UNIT_LEVEL_CLKGATE2 ,CPSSUNIT_CLKGATE_DIS );/* Wa_1607087056:tgl also know as BUG:1409180338 */ -if (IS_TGL_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 )) +if (IS_TGL_UY_GT_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 ))wa_write_or (wal,SLICE_UNIT_LEVEL_CLKGATE ,L3_CLKGATE_DIS |L3_CR2X_CLKGATE_DIS );@@ -1660,7 +1673,7 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) {struct drm_i915_private *i915 = engine->i915; -if (IS_TGL_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 )) { +if (IS_TGL_UY_GT_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 )) {/* * Wa_1607138336:tgl * Wa_1607063988:tgl
drivers/gpu/drm/i915/gt/intel_workarounds.c rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) · line 1714
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +2
-0@@ -1697,6 +1710,9 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal)wa_masked_en (wal,GEN9_ROW_CHICKEN4 ,GEN12_DISABLE_TDL_PUSH );/* +* TODO: still pending the decision if this WA is permanent for +* plain TGL SKU(not TGL-U/Y).
Wa_14010919138(mentioned one line bellow 'Wa_22010931296:tgl B0+') is now permanent so this TODO can be removed.
Quoted 70 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +2
-1+* * Wa_1407928979:tgl A* * Wa_18011464164:tgl B0+ * Wa_22010931296:tgl B0+ @@ -1718,7 +1734,7 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) GEN8_RC_SEMA_IDLE_MSG_DISABLE); } -if (IS_TIGERLAKE (i915)) { +if (IS_TGL_U (i915) ||IS_TGL_Y (i915)) {/* Wa_1606700617:tgl */ wa_masked_en(wal, GEN9_CS_DEBUG_MODE1,drivers/gpu/drm/i915/i915_drv.h +34
-5@@ -1572,12 +1572,41 @@ extern const struct i915_rev_steppings kbl_revids[];#define IS_EHL_REVID (p, since, until) \ (IS_ELKHARTLAKE(p) && IS_REVID(p, since, until)) -#define TGL_REVID_A0 0x0 -#define TGL_REVID_B0 0x1 -#define TGL_REVID_C0 0x2 +enum { +TGL_REVID_A0 , +TGL_REVID_B0 , +TGL_REVID_B1 , +TGL_REVID_C0 , +TGL_REVID_D0 , +}; + +extern const struct i915_rev_steppings tgl_uy_revids[]; +extern const struct i915_rev_steppings tgl_revids[]; + +static inline const struct i915_rev_steppings * +tgl_revids_get (struct drm_i915_private *dev_priv) +{ +if (IS_TGL_U (dev_priv) ||IS_TGL_Y (dev_priv)) +return tgl_uy_revids; +else +return tgl_revids; +} -#define IS_TGL_REVID (p, since, until) \ - (IS_TIGERLAKE(p) && IS_REVID(p, since, until)) +#define IS_TGL_DISP_REVID (p, since, until) \ + (IS_TIGERLAKE(p) && \ + tgl_revids_get(p)->disp_stepping >= (since) && \ + tgl_revids_get(p)->disp_stepping <= (until)) + +#define IS_TGL_UY_GT_REVID (p, since, until) \ + ((IS_TGL_U(p) || IS_TGL_Y(p)) && \ + tgl_uy_revids->gt_stepping >= (since) && \ + tgl_uy_revids->gt_stepping <= (until)) + +#define IS_TGL_GT_REVID (p, since, until) \ + (IS_TIGERLAKE(p) && \ + !(IS_TGL_U(p) || IS_TGL_Y(p)) && \ + tgl_revids->gt_stepping >= (since) && \ + tgl_revids->gt_stepping <= (until))#define RKL_REVID_A0 0x0#define RKL_REVID_B0 0x1drivers/gpu/drm/i915/intel_pm.c +0
-0
drivers/gpu/drm/i915/intel_pm.c static void tgl_init_clock_gating(struct drm_i915_private *dev_priv) · line 7142
Quoted 8 lines
drivers/gpu/drm/i915/intel_pm.c +1
-1@@ -7136,7 +7136,7 @@ static void tgl_init_clock_gating(struct drm_i915_private *dev_priv) I915_READ(POWERGATE_ENABLE) | vd_pg_enable);/* Wa_1409825376:tgl (pre-prod)*/ -if (IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_A0 )) +if (IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_B1 ))I915_WRITE (GEN9_CLKGATE_DIS_3 ,I915_READ (GEN9_CLKGATE_DIS_3 ) |TGL_VRH_GATING_DIS );
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 119 lines
-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Souza, Jose
Sent: Tuesday, August 25, 2020 12:49 PM
To: [email protected]
Cc: Bai, Guangyao <[email protected]>; Lee, Penne Y <[email protected]>
Subject: Re: [Intel-gfx] [PATCH] drm/i915/tgl: Fix stepping WA matchingdrivers/gpu/drm/i915/display/intel_display_power.c static void tgl_bw_buddy_init(struct
Quoted 43 lines · José Roberto de Souza
TGL made stepping a litte mess, workarounds refer to the stepping of the IP(GT or Display) not of the GPU stepping so it would already require the same solution as used in commit
96c5a15f9f39("drm/i915/kbl: Fix revision ID checks").
But to make things even more messy it have a different IP stepping mapping between SKUs and the same stepping revision of GT do not match the same HW between TGL U/Y and regular TGL.So it was required to have 2 different macros to check GT WAs while for Display we are able to use just one macro that uses the right revids table.
All TGL workarounds checked and updated accordingly.
BSpec: 52890
BSpec: 55378
BSpec: 44455
Cc: Penne Lee <
[email protected]Quoted 1 line
Cc: Guangyao Bai <
[email protected]Quoted 1 line
Cc: Matt Roper <
[email protected]Quoted 1 line
Signed-off-by José Roberto de Souza < [email protected]Quoted 1 line
--- .../drm/i915/display/intel_display_power.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 4 +- drivers/gpu/drm/i915/display/intel_sprite.c | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 24 ++++++++++-- drivers/gpu/drm/i915/i915_drv.h | 39 ++++++++++++++++--- drivers/gpu/drm/i915/intel_pm.c | 2 +- 6 files changed, 59 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/display/intel_display_power.c +0
-0@@ -5263,7 +5263,7 @@ static void tgl_bw_buddy_init(struct
drm_i915_private*dev_priv)Quoted 14 lines
drivers/gpu/drm/i915/display/intel_display_power.c +1
-1unsigned long abox_mask =INTEL_INFO (dev_priv)->abox_mask;int config, i; -if (IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_B0 )) +if (IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_B0 ))/* Wa_1409767108: tgl */ table = wa_1409767108_buddy_page_masks;else drivers/gpu/drm/i915/display/intel_psr.c +0
-0drivers/gpu/drm/i915/display/intel_psr.c static void hsw_activate_psr2(struct intel_dp · line 559
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_psr.c +1
-1@@ -555,7 +555,7 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp)if (dev_priv->psr.psr2_sel_fetch_enabled) {/* WA 1408330847 */ - if (IS_TGL_REVID(dev_priv, TGL_REVID_A0, TGL_REVID_A0) || + if (IS_TGL_DISP_REVID(dev_priv, TGL_REVID_A0,
TGL_REVID_A0) ||Quoted 3 lines
drivers/gpu/drm/i915/display/intel_psr.c +0
-0IS_RKL_REVID(dev_priv, RKL_REVID_A0, RKL_REVID_A0)) intel_de_rmw(dev_priv, CHICKEN_PAR1_1,
DIS_RAM_BYPASS_PSR2_MAN_TRACK,(quoted diff) +0
-0@@ -1109,7 +1109,7 @@ static > void intel_psr_disable_locked(struct intel_dp *intel_dp)drivers/gpu/drm/i915/display/intel_sprite.c static bool
Quoted 14 lines
drivers/gpu/drm/i915/display/intel_psr.c +1
-1/* WA 1408330847 */ if (dev_priv->psr.psr2_sel_fetch_enabled && - (IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_A0 ) || + (IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_A0 ) ||IS_RKL_REVID (dev_priv,RKL_REVID_A0 ,RKL_REVID_A0 )))intel_de_rmw (dev_priv,CHICKEN_PAR1_1 , DIS_RAM_BYPASS_PSR2_MAN_TRACK, 0); diff --git
a/drivers/gpu/drm/i915/display/intel_sprite.cb/drivers/gpu/drm/i915/display/intel_sprite.c
indexc26ca029fc0a..1797a06cfd60100644drivers/gpu/drm/i915/display/intel_sprite.c +0
-0@@ -2845,7 +2845,7 @@ static boolgen12_plane_supports_mc_ccs(struct
Quoted 14 lines
drivers/gpu/drm/i915/display/intel_sprite.c +1
-1drm_i915_private *dev_priv, {/* Wa_14010477008:tgl[a0..c0],rkl[all] */ if (IS_ROCKETLAKE (dev_priv) || -IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_C0 )) +IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_C0 ))return false;return plane_id <PLANE_SPRITE4 ;drivers/gpu/drm/i915/gt/intel_workarounds.c +0
-0drivers/gpu/drm/i915/gt/intel_workarounds.c const struct i915_rev_steppings kbl_revids[] = { · line 74
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +2
-0@@ -70,6 +70,19 @@ const struct i915_rev_steppings kbl_revids[] = { [7 ] = { .gt_stepping =KBL_REVID_G0 , .disp_stepping =KBL_REVID_C0 }, }; +const struct i915_rev_steppings tgl_uy_revids[] = { + [0 ] = { .gt_stepping =TGL_REVID_A0 , .disp_stepping =TGL_REVID_A0 },
drivers/gpu/drm/i915/gt/intel_workarounds.c const struct i915_rev_steppings kbl_revids[] = { · line 75
Quoted 1 line
drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-0+ [1] = { .gt_stepping = TGL_REVID_B0, .disp_stepping = TGL_REVID_C0},
Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c const struct i915_rev_steppings kbl_revids[] = { · line 76
Quoted 1 line
drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-0+ [2] = { .gt_stepping = TGL_REVID_B1, .disp_stepping = TGL_REVID_C0},
drivers/gpu/drm/i915/gt/intel_workarounds.c const struct i915_rev_steppings kbl_revids[] = { · line 82
Quoted 6 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +6
-0+ [3 ] = { .gt_stepping =TGL_REVID_C0 , .disp_stepping =TGL_REVID_D0 +}, }; + +/* Same GT stepping between tgl_uy_revids and tgl_revids don't mean +the same HW */ const struct i915_rev_steppings tgl_revids[] = { + [0 ] = { .gt_stepping =TGL_REVID_A0 , .disp_stepping =TGL_REVID_A0
Shouldn’t this have display stepping as B0? Or am I missing something?
Anusha
Quoted 125 lines
},
drivers/gpu/drm/i915/gt/intel_workarounds.c tgl_gt_workarounds_init(struct
Quoted 7 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +3
-0+ [1 ] = { .gt_stepping =TGL_REVID_B0 , .disp_stepping =TGL_REVID_D0 +}, }; +static void wa_init_start (struct i915_wa_list *wal,const char *name,const char *engine_name) { wal->name = name;@@ -1219,13 +1232,13 @@ tgl_gt_workarounds_init(struct
drm_i915_private*i915, structi915_wa_list*wal)Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-1gen12_gt_workarounds_init (i915, wal);/* Wa_1409420604:tgl */ -if (IS_TGL_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 )) +if (IS_TGL_UY_GT_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 ))drivers/gpu/drm/i915/gt/intel_workarounds.c tgl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-1wa_write_or (wal,SUBSLICE_UNIT_LEVEL_CLKGATE2 ,CPSSUNIT_CLKGATE_DIS );/* Wa_1607087056:tgl also know as BUG:1409180338 */ -if (IS_TGL_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 )) +if (IS_TGL_UY_GT_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 ))wa_write_or (wal,SLICE_UNIT_LEVEL_CLKGATE , L3_CLKGATE_DIS | L3_CR2X_CLKGATE_DIS); @@ -1660,7 +1673,7 @@
drivers/gpu/drm/i915/gt/intel_workarounds.c rcs_engine_wa_init(struct intel_engine_cs
Quoted 10 lines
rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal){drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-1struct drm_i915_private *i915 = engine->i915; -if (IS_TGL_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 )) { +if (IS_TGL_UY_GT_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 )) {/* * Wa_1607138336:tgl * Wa_1607063988:tgl @@ -1697,6 +1710,9 @@ rcs_engine_wa_init(struct intel_engine_cs*engine, struct
i915_wa_list*wal)drivers/gpu/drm/i915/gt/intel_workarounds.c rcs_engine_wa_init(struct intel_engine_cs · line 1710
Quoted 1 line
drivers/gpu/drm/i915/gt/intel_workarounds.c +0
-0wa_masked_en(wal, GEN9_ROW_CHICKEN4,
GEN12_DISABLE_TDL_PUSH);drivers/gpu/drm/i915/gt/intel_workarounds.c rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) · line 1714
Quoted 4 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +2
-0/* +* TODO: still pending the decision if this WA is permanent for +* plain TGL SKU(not TGL-U/Y).
Wa_14010919138(mentioned one line bellow 'Wa_22010931296:tgl B0+')is now permanent so this TODO can be removed.drivers/gpu/drm/i915/gt/intel_workarounds.c rcs_engine_wa_init(struct intel_engine_cs
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-0+* * Wa_1407928979:tgl A* * Wa_18011464164:tgl B0+ * Wa_22010931296:tgl B0+ @@ -1718,7 +1734,7 @@ rcs_engine_wa_init(struct intel_engine_cs*engine, struct
i915_wa_list*wal)drivers/gpu/drm/i915/intel_pm.c static void tgl_init_clock_gating(struct
Quoted 65 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-1GEN8_RC_SEMA_IDLE_MSG_DISABLE); } -if (IS_TIGERLAKE (i915)) { +if (IS_TGL_U (i915) ||IS_TGL_Y (i915)) {/* Wa_1606700617:tgl */ wa_masked_en(wal, GEN9_CS_DEBUG_MODE1,(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hindex8e25dd15a2ec..499eb0a4ad3a100644drivers/gpu/drm/i915/i915_drv.h +33
-5@@ -1572,12 +1572,41 @@ extern const struct i915_rev_steppings kbl_revids[]; #define IS_EHL_REVID(p, since, until) \ (IS_ELKHARTLAKE(p) && IS_REVID(p, since, until)) -#define TGL_REVID_A0 0x0 -#define TGL_REVID_B0 0x1 -#define TGL_REVID_C0 0x2 +enum { +TGL_REVID_A0 , +TGL_REVID_B0 , +TGL_REVID_B1 , +TGL_REVID_C0 , +TGL_REVID_D0 , +}; + +extern const struct i915_rev_steppings tgl_uy_revids[];extern const +struct i915_rev_steppings tgl_revids[]; + +static inline const struct i915_rev_steppings *tgl_revids_get (struct +drm_i915_private *dev_priv) { +if (IS_TGL_U (dev_priv) ||IS_TGL_Y (dev_priv)) +return tgl_uy_revids; +else +return tgl_revids; +} -#define IS_TGL_REVID (p, since, until) \ - (IS_TIGERLAKE(p) && IS_REVID(p, since, until)) +#define IS_TGL_DISP_REVID (p, since, until) \ + (IS_TIGERLAKE(p) && \ + tgl_revids_get(p)->disp_stepping >= (since) && \ + tgl_revids_get(p)->disp_stepping <= (until)) + +#define IS_TGL_UY_GT_REVID (p, since, until) \ + ((IS_TGL_U(p) || IS_TGL_Y(p)) && \ + tgl_uy_revids->gt_stepping >= (since) && \ + tgl_uy_revids->gt_stepping <= (until)) + +#define IS_TGL_GT_REVID (p, since, until) \ + (IS_TIGERLAKE(p) && \ + !(IS_TGL_U(p) || IS_TGL_Y(p)) && \ + tgl_revids->gt_stepping >= (since) && \ + tgl_revids->gt_stepping <= (until))#define RKL_REVID_A0 0x0#define RKL_REVID_B0 0x1(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_pm.cindexb4bd19266b8c..34e0d22d456b100644drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -7136,7 +7136,7 @@ static void tgl_init_clock_gating(struct
drm_i915_private*dev_priv)drivers/gpu/drm/i915/intel_pm.c static void tgl_init_clock_gating(struct drm_i915_private *dev_priv)
Quoted 6 lines
drivers/gpu/drm/i915/intel_pm.c +1
-1I915_READ(POWERGATE_ENABLE) | vd_pg_enable);/* Wa_1409825376:tgl (pre-prod)*/ -if (IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_A0 )) +if (IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_B1 )) I915_WRITE(GEN9_CLKGATE_DIS_3,
I915_READ(GEN9_CLKGATE_DIS_3)|
Quoted 7 lines
drivers/gpu/drm/i915/intel_pm.c static void tgl_init_clock_gating(struct drm_i915_private *dev_priv) · line 7142
Quoted 3 lines
drivers/gpu/drm/i915/intel_pm.c +0
-0TGL_VRH_GATING_DIS);_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 139 lines · Anusha
Quoted 139 lines
-----Original Message-----
From: Intel-gfx <
[email protected]Quoted 1 line
On Behalf Of Souza,
Jose
Sent: Tuesday, August 25, 2020 12:49 PM
To:
[email protected]Cc: Bai, Guangyao <
[email protected]Quoted 1 line
; Lee, Penne Y
Quoted 1 line
Subject: Re: [Intel-gfx] [PATCH] drm/i915/tgl: Fix stepping WA matching
drivers/gpu/drm/i915/display/intel_display_power.c static void tgl_bw_buddy_init(struct
Quoted 48 lines · José Roberto de Souza
TGL made stepping a litte mess, workarounds refer to the stepping of the IP(GT or Display) not of the GPU stepping so it would already require the same solution as used in commit
96c5a15f9f39("drm/i915/kbl: Fix revision ID checks").
But to make things even more messy it have a different IP stepping mapping between SKUs and the same stepping revision of GT do not match the same HW between TGL U/Y and regular TGL.So it was required to have 2 different macros to check GT WAs while for Display we are able to use just one macro that uses the right revids table.
All TGL workarounds checked and updated accordingly.
BSpec: 52890
BSpec: 55378
BSpec: 44455
Cc: Penne Lee <
[email protected]Cc: Guangyao Bai <
[email protected]Cc: Matt Roper <
[email protected]Signed-off-by: José Roberto de Souza <
[email protected]--- .../drm/i915/display/intel_display_power.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 4 +- drivers/gpu/drm/i915/display/intel_sprite.c | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 24 ++++++++++-- drivers/gpu/drm/i915/i915_drv.h | 39 ++++++++++++++++--- drivers/gpu/drm/i915/intel_pm.c | 2 +- 6 files changed, 59 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/display/intel_display_power.c +0
-0@@ -5263,7 +5263,7 @@ static void tgl_bw_buddy_init(struct
drm_i915_private*dev_priv)Quoted 14 lines
drivers/gpu/drm/i915/display/intel_display_power.c +1
-1unsigned long abox_mask =INTEL_INFO (dev_priv)->abox_mask;int config, i; -if (IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_B0 )) +if (IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_B0 ))/* Wa_1409767108: tgl */ table = wa_1409767108_buddy_page_masks;else drivers/gpu/drm/i915/display/intel_psr.c +0
-0drivers/gpu/drm/i915/display/intel_psr.c static void hsw_activate_psr2(struct intel_dp · line 559
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_psr.c +1
-1@@ -555,7 +555,7 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp)if (dev_priv->psr.psr2_sel_fetch_enabled) {/* WA 1408330847 */ - if (IS_TGL_REVID(dev_priv, TGL_REVID_A0, TGL_REVID_A0) || + if (IS_TGL_DISP_REVID(dev_priv, TGL_REVID_A0,
TGL_REVID_A0) ||Quoted 3 lines
drivers/gpu/drm/i915/display/intel_psr.c +0
-0IS_RKL_REVID(dev_priv, RKL_REVID_A0, RKL_REVID_A0)) intel_de_rmw(dev_priv, CHICKEN_PAR1_1,
DIS_RAM_BYPASS_PSR2_MAN_TRACK,(quoted diff) +0
-0@@ -1109,7 +1109,7 @@ static > void intel_psr_disable_locked(struct intel_dp *intel_dp)drivers/gpu/drm/i915/display/intel_sprite.c static bool
Quoted 14 lines
drivers/gpu/drm/i915/display/intel_psr.c +1
-1/* WA 1408330847 */ if (dev_priv->psr.psr2_sel_fetch_enabled && - (IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_A0 ) || + (IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_A0 ) ||IS_RKL_REVID (dev_priv,RKL_REVID_A0 ,RKL_REVID_A0 )))intel_de_rmw (dev_priv,CHICKEN_PAR1_1 , DIS_RAM_BYPASS_PSR2_MAN_TRACK, 0); diff --git
a/drivers/gpu/drm/i915/display/intel_sprite.cb/drivers/gpu/drm/i915/display/intel_sprite.c
indexc26ca029fc0a..1797a06cfd60100644drivers/gpu/drm/i915/display/intel_sprite.c +0
-0@@ -2845,7 +2845,7 @@ static boolgen12_plane_supports_mc_ccs(struct
Quoted 14 lines
drivers/gpu/drm/i915/display/intel_sprite.c +1
-1drm_i915_private *dev_priv, {/* Wa_14010477008:tgl[a0..c0],rkl[all] */ if (IS_ROCKETLAKE (dev_priv) || -IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_C0 )) +IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_C0 ))return false;return plane_id <PLANE_SPRITE4 ;drivers/gpu/drm/i915/gt/intel_workarounds.c +0
-0drivers/gpu/drm/i915/gt/intel_workarounds.c const struct i915_rev_steppings kbl_revids[] = { · line 74
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +2
-0@@ -70,6 +70,19 @@ const struct i915_rev_steppings kbl_revids[] = { [7 ] = { .gt_stepping =KBL_REVID_G0 , .disp_stepping =KBL_REVID_C0 }, }; +const struct i915_rev_steppings tgl_uy_revids[] = { + [0 ] = { .gt_stepping =TGL_REVID_A0 , .disp_stepping =TGL_REVID_A0 },
drivers/gpu/drm/i915/gt/intel_workarounds.c const struct i915_rev_steppings kbl_revids[] = { · line 75
Quoted 1 line
drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-0+ [1] = { .gt_stepping = TGL_REVID_B0, .disp_stepping = TGL_REVID_C0},
drivers/gpu/drm/i915/gt/intel_workarounds.c const struct i915_rev_steppings kbl_revids[] = { · line 76
Quoted 1 line
drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-0+ [2] = { .gt_stepping = TGL_REVID_B1, .disp_stepping = TGL_REVID_C0},
Quoted 8 lines
Quoted 6 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c const struct i915_rev_steppings kbl_revids[] = { · line 82
Quoted 6 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +6
-0+ [3 ] = { .gt_stepping =TGL_REVID_C0 , .disp_stepping =TGL_REVID_D0 +}, }; + +/* Same GT stepping between tgl_uy_revids and tgl_revids don't mean +the same HW */ const struct i915_rev_steppings tgl_revids[] = { + [0 ] = { .gt_stepping =TGL_REVID_A0 , .disp_stepping =TGL_REVID_A0 Shouldn’t this have display stepping as B0? Or am I missing something?
It should, thanks for catching this.
Any other issues? Can I add your rv-b with the above fixed?
Quoted 144 lines
Anusha
Quoted 141 lines
},
drivers/gpu/drm/i915/gt/intel_workarounds.c tgl_gt_workarounds_init(struct
Quoted 7 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +3
-0+ [1 ] = { .gt_stepping =TGL_REVID_B0 , .disp_stepping =TGL_REVID_D0 +}, }; +static void wa_init_start (struct i915_wa_list *wal,const char *name,const char *engine_name) { wal->name = name;@@ -1219,13 +1232,13 @@ tgl_gt_workarounds_init(struct
drm_i915_private*i915, structi915_wa_list*wal)Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-1gen12_gt_workarounds_init (i915, wal);/* Wa_1409420604:tgl */ -if (IS_TGL_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 )) +if (IS_TGL_UY_GT_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 ))drivers/gpu/drm/i915/gt/intel_workarounds.c tgl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-1wa_write_or (wal,SUBSLICE_UNIT_LEVEL_CLKGATE2 ,CPSSUNIT_CLKGATE_DIS );/* Wa_1607087056:tgl also know as BUG:1409180338 */ -if (IS_TGL_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 )) +if (IS_TGL_UY_GT_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 ))wa_write_or (wal,SLICE_UNIT_LEVEL_CLKGATE , L3_CLKGATE_DIS | L3_CR2X_CLKGATE_DIS); @@ -1660,7 +1673,7 @@
drivers/gpu/drm/i915/gt/intel_workarounds.c rcs_engine_wa_init(struct intel_engine_cs
Quoted 10 lines
rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal){drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-1struct drm_i915_private *i915 = engine->i915; -if (IS_TGL_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 )) { +if (IS_TGL_UY_GT_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 )) {/* * Wa_1607138336:tgl * Wa_1607063988:tgl @@ -1697,6 +1710,9 @@ rcs_engine_wa_init(struct intel_engine_cs*engine, struct
i915_wa_list*wal)drivers/gpu/drm/i915/gt/intel_workarounds.c rcs_engine_wa_init(struct intel_engine_cs · line 1710
Quoted 1 line
drivers/gpu/drm/i915/gt/intel_workarounds.c +0
-0wa_masked_en(wal, GEN9_ROW_CHICKEN4,
GEN12_DISABLE_TDL_PUSH);drivers/gpu/drm/i915/gt/intel_workarounds.c rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) · line 1714
Quoted 3 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +2
-0/* +* TODO: still pending the decision if this WA is permanent for +* plain TGL SKU(not TGL-U/Y).
Wa_14010919138(mentioned one line bellow 'Wa_22010931296:tgl B0+')is now permanent so this TODO can be removed.drivers/gpu/drm/i915/gt/intel_workarounds.c rcs_engine_wa_init(struct intel_engine_cs
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-0+* * Wa_1407928979:tgl A* * Wa_18011464164:tgl B0+ * Wa_22010931296:tgl B0+ @@ -1718,7 +1734,7 @@ rcs_engine_wa_init(struct intel_engine_cs*engine, struct
i915_wa_list*wal)drivers/gpu/drm/i915/intel_pm.c static void tgl_init_clock_gating(struct
Quoted 65 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-1GEN8_RC_SEMA_IDLE_MSG_DISABLE); } -if (IS_TIGERLAKE (i915)) { +if (IS_TGL_U (i915) ||IS_TGL_Y (i915)) {/* Wa_1606700617:tgl */ wa_masked_en(wal, GEN9_CS_DEBUG_MODE1,(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hindex8e25dd15a2ec..499eb0a4ad3a100644drivers/gpu/drm/i915/i915_drv.h +33
-5@@ -1572,12 +1572,41 @@ extern const struct i915_rev_steppings kbl_revids[]; #define IS_EHL_REVID(p, since, until) \ (IS_ELKHARTLAKE(p) && IS_REVID(p, since, until)) -#define TGL_REVID_A0 0x0 -#define TGL_REVID_B0 0x1 -#define TGL_REVID_C0 0x2 +enum { +TGL_REVID_A0 , +TGL_REVID_B0 , +TGL_REVID_B1 , +TGL_REVID_C0 , +TGL_REVID_D0 , +}; + +extern const struct i915_rev_steppings tgl_uy_revids[];extern const +struct i915_rev_steppings tgl_revids[]; + +static inline const struct i915_rev_steppings *tgl_revids_get (struct +drm_i915_private *dev_priv) { +if (IS_TGL_U (dev_priv) ||IS_TGL_Y (dev_priv)) +return tgl_uy_revids; +else +return tgl_revids; +} -#define IS_TGL_REVID (p, since, until) \ - (IS_TIGERLAKE(p) && IS_REVID(p, since, until)) +#define IS_TGL_DISP_REVID (p, since, until) \ + (IS_TIGERLAKE(p) && \ + tgl_revids_get(p)->disp_stepping >= (since) && \ + tgl_revids_get(p)->disp_stepping <= (until)) + +#define IS_TGL_UY_GT_REVID (p, since, until) \ + ((IS_TGL_U(p) || IS_TGL_Y(p)) && \ + tgl_uy_revids->gt_stepping >= (since) && \ + tgl_uy_revids->gt_stepping <= (until)) + +#define IS_TGL_GT_REVID (p, since, until) \ + (IS_TIGERLAKE(p) && \ + !(IS_TGL_U(p) || IS_TGL_Y(p)) && \ + tgl_revids->gt_stepping >= (since) && \ + tgl_revids->gt_stepping <= (until))#define RKL_REVID_A0 0x0#define RKL_REVID_B0 0x1(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_pm.cindexb4bd19266b8c..34e0d22d456b100644drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -7136,7 +7136,7 @@ static void tgl_init_clock_gating(struct
drm_i915_private*dev_priv)drivers/gpu/drm/i915/intel_pm.c static void tgl_init_clock_gating(struct drm_i915_private *dev_priv)
Quoted 6 lines
drivers/gpu/drm/i915/intel_pm.c +1
-1I915_READ(POWERGATE_ENABLE) | vd_pg_enable);/* Wa_1409825376:tgl (pre-prod)*/ -if (IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_A0 )) +if (IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_B1 )) I915_WRITE(GEN9_CLKGATE_DIS_3,
I915_READ(GEN9_CLKGATE_DIS_3)|drivers/gpu/drm/i915/intel_pm.c static void tgl_init_clock_gating(struct drm_i915_private *dev_priv) · line 7142
Quoted 3 lines
drivers/gpu/drm/i915/intel_pm.c +0
-0TGL_VRH_GATING_DIS);_______________________________________________
Intel-gfx mailing list
[email protected]
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Srivatsa, Anusha
Reviewed-by Anusha SrivatsaWith the stepping fix mentioned below,
Quoted 280 lines
-----Original Message-----
From: Souza, Jose <[email protected]>
Sent: Thursday, August 27, 2020 3:57 PM
To: Srivatsa, Anusha <[email protected]>; intel- [email protected]
Cc: Bai, Guangyao <[email protected]>; Lee, Penne Y <[email protected]>
Subject: Re: [PATCH] drm/i915/tgl: Fix stepping WA matchingQuoted 139 lines · Anusha
Quoted 139 lines
-----Original Message-----
From: Intel-gfx <
[email protected]Quoted 1 line
On Behalf Of Souza,
Jose
Sent: Tuesday, August 25, 2020 12:49 PM
To:
[email protected]Cc: Bai, Guangyao <
[email protected]Quoted 1 line
; Lee, Penne Y
Quoted 1 line
Subject: Re: [Intel-gfx] [PATCH] drm/i915/tgl: Fix stepping WA matching
drivers/gpu/drm/i915/display/intel_display_power.c static void tgl_bw_buddy_init(struct
Quoted 47 lines · José Roberto de Souza
TGL made stepping a litte mess, workarounds refer to the stepping of the IP(GT or Display) not of the GPU stepping so it would already require the same solution as used in commit
96c5a15f9f39("drm/i915/kbl: Fix revision ID checks").
But to make things even more messy it have a different IP stepping mapping between SKUs and the same stepping revision of GT do not match the same HW between TGL U/Y and regular TGL.So it was required to have 2 different macros to check GT WAs while for Display we are able to use just one macro that uses the right revids table.
All TGL workarounds checked and updated accordingly.
BSpec: 52890
BSpec: 55378
BSpec: 44455
Cc: Penne Lee <
[email protected]Cc: Guangyao Bai <
[email protected]Cc: Matt Roper <
[email protected]Signed-off-by José Roberto de Souza < [email protected]--- .../drm/i915/display/intel_display_power.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 4 +- drivers/gpu/drm/i915/display/intel_sprite.c | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 24 ++++++++++-- drivers/gpu/drm/i915/i915_drv.h | 39 ++++++++++++++++--- drivers/gpu/drm/i915/intel_pm.c | 2 +- 6 files changed, 59 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/display/intel_display_power.c +0
-0@@ -5263,7 +5263,7 @@ static void tgl_bw_buddy_init(struct
drm_i915_private*dev_priv)Quoted 14 lines
drivers/gpu/drm/i915/display/intel_display_power.c +1
-1unsigned long abox_mask =INTEL_INFO (dev_priv)->abox_mask;int config, i; -if (IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_B0 )) +if (IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_B0 ))/* Wa_1409767108: tgl */ table = wa_1409767108_buddy_page_masks;else drivers/gpu/drm/i915/display/intel_psr.c +0
-0drivers/gpu/drm/i915/display/intel_psr.c static void hsw_activate_psr2(struct intel_dp · line 559
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_psr.c +1
-1@@ -555,7 +555,7 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp)if (dev_priv->psr.psr2_sel_fetch_enabled) {/* WA 1408330847 */ - if (IS_TGL_REVID(dev_priv, TGL_REVID_A0, TGL_REVID_A0) || + if (IS_TGL_DISP_REVID(dev_priv, TGL_REVID_A0,
TGL_REVID_A0) ||Quoted 3 lines
drivers/gpu/drm/i915/display/intel_psr.c +0
-0IS_RKL_REVID(dev_priv, RKL_REVID_A0, RKL_REVID_A0)) intel_de_rmw(dev_priv, CHICKEN_PAR1_1,
DIS_RAM_BYPASS_PSR2_MAN_TRACK,(quoted diff) +0
-0@@ -1109,7 +1109,7 @@ static > void intel_psr_disable_locked(struct intel_dp *intel_dp)drivers/gpu/drm/i915/display/intel_sprite.c static bool
Quoted 14 lines
drivers/gpu/drm/i915/display/intel_psr.c +1
-1/* WA 1408330847 */ if (dev_priv->psr.psr2_sel_fetch_enabled && - (IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_A0 ) || + (IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_A0 ) ||IS_RKL_REVID (dev_priv,RKL_REVID_A0 ,RKL_REVID_A0 )))intel_de_rmw (dev_priv,CHICKEN_PAR1_1 , DIS_RAM_BYPASS_PSR2_MAN_TRACK, 0); diff --git
a/drivers/gpu/drm/i915/display/intel_sprite.cb/drivers/gpu/drm/i915/display/intel_sprite.c
indexc26ca029fc0a..1797a06cfd60100644drivers/gpu/drm/i915/display/intel_sprite.c +0
-0@@ -2845,7 +2845,7 @@ static boolgen12_plane_supports_mc_ccs(struct
Quoted 14 lines
drivers/gpu/drm/i915/display/intel_sprite.c +1
-1drm_i915_private *dev_priv, {/* Wa_14010477008:tgl[a0..c0],rkl[all] */ if (IS_ROCKETLAKE (dev_priv) || -IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_C0 )) +IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_C0 ))return false;return plane_id <PLANE_SPRITE4 ;drivers/gpu/drm/i915/gt/intel_workarounds.c +0
-0drivers/gpu/drm/i915/gt/intel_workarounds.c const struct i915_rev_steppings kbl_revids[] = { · line 74
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +2
-0@@ -70,6 +70,19 @@ const struct i915_rev_steppings kbl_revids[] = { [7 ] = { .gt_stepping =KBL_REVID_G0 , .disp_stepping =KBL_REVID_C0 }, }; +const struct i915_rev_steppings tgl_uy_revids[] = { + [0 ] = { .gt_stepping =TGL_REVID_A0 , .disp_stepping =TGL_REVID_A0 },
drivers/gpu/drm/i915/gt/intel_workarounds.c const struct i915_rev_steppings kbl_revids[] = { · line 75
Quoted 1 line
drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-0+ [1] = { .gt_stepping = TGL_REVID_B0, .disp_stepping = TGL_REVID_C0},
drivers/gpu/drm/i915/gt/intel_workarounds.c const struct i915_rev_steppings kbl_revids[] = { · line 76
Quoted 1 line
drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-0+ [2] = { .gt_stepping = TGL_REVID_B1, .disp_stepping = TGL_REVID_C0},
Quoted 8 lines
Quoted 6 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c const struct i915_rev_steppings kbl_revids[] = { · line 82
Quoted 6 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +6
-0+ [3 ] = { .gt_stepping =TGL_REVID_C0 , .disp_stepping =TGL_REVID_D0 +}, }; + +/* Same GT stepping between tgl_uy_revids and tgl_revids don't mean +the same HW */ const struct i915_rev_steppings tgl_revids[] = { + [0 ] = { .gt_stepping =TGL_REVID_A0 , .disp_stepping =TGL_REVID_A0 Shouldn’t this have display stepping as B0? Or am I missing something?
It should, thanks for catching this.
Any other issues? Can I add your rv-b with the above fixed?
Quoted 50 lines
Anusha
Quoted 47 lines
},
drivers/gpu/drm/i915/gt/intel_workarounds.c tgl_gt_workarounds_init(struct
Quoted 7 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +3
-0+ [1 ] = { .gt_stepping =TGL_REVID_B0 , .disp_stepping =TGL_REVID_D0 +}, }; +static void wa_init_start (struct i915_wa_list *wal,const char *name,const char *engine_name) { wal->name = name;@@ -1219,13 +1232,13 @@ tgl_gt_workarounds_init(struct
drm_i915_private*i915, structi915_wa_list*wal)Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-1gen12_gt_workarounds_init (i915, wal);/* Wa_1409420604:tgl */ -if (IS_TGL_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 )) +if (IS_TGL_UY_GT_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 ))drivers/gpu/drm/i915/gt/intel_workarounds.c tgl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-1wa_write_or (wal,SUBSLICE_UNIT_LEVEL_CLKGATE2 ,CPSSUNIT_CLKGATE_DIS );/* Wa_1607087056:tgl also know as BUG:1409180338 */ -if (IS_TGL_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 )) +if (IS_TGL_UY_GT_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 ))wa_write_or (wal,SLICE_UNIT_LEVEL_CLKGATE , L3_CLKGATE_DIS | L3_CR2X_CLKGATE_DIS); @@ -1660,7 +1673,7 @@
drivers/gpu/drm/i915/gt/intel_workarounds.c rcs_engine_wa_init(struct intel_engine_cs
Quoted 10 lines
rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal){drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-1struct drm_i915_private *i915 = engine->i915; -if (IS_TGL_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 )) { +if (IS_TGL_UY_GT_REVID (i915,TGL_REVID_A0 ,TGL_REVID_A0 )) {/* * Wa_1607138336:tgl * Wa_1607063988:tgl @@ -1697,6 +1710,9 @@ rcs_engine_wa_init(struct intel_engine_cs*engine, struct
i915_wa_list*wal)drivers/gpu/drm/i915/gt/intel_workarounds.c rcs_engine_wa_init(struct intel_engine_cs · line 1710
Quoted 1 line
drivers/gpu/drm/i915/gt/intel_workarounds.c +0
-0wa_masked_en(wal, GEN9_ROW_CHICKEN4,
GEN12_DISABLE_TDL_PUSH);drivers/gpu/drm/i915/gt/intel_workarounds.c rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) · line 1714
Quoted 3 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +2
-0/* +* TODO: still pending the decision if this WA is permanent for +* plain TGL SKU(not TGL-U/Y). Wa_14010919138(mentioned one line bellow 'Wa_22010931296:tgl
B0+') is
Quoted 12 lines
Quoted 12 lines
now permanent so this TODO can be removed.
drivers/gpu/drm/i915/gt/intel_workarounds.c rcs_engine_wa_init(struct intel_engine_cs
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-0+* * Wa_1407928979:tgl A* * Wa_18011464164:tgl B0+ * Wa_22010931296:tgl B0+ @@ -1718,7 +1734,7 @@ rcs_engine_wa_init(struct intel_engine_cs*engine, struct
i915_wa_list*wal)Quoted 3 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +0
-0GEN8_RC_SEMA_IDLE_MSG_DISABLE); }Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-1-if (IS_TIGERLAKE (i915)) { +if (IS_TGL_U (i915) ||IS_TGL_Y (i915)) {/* Wa_1606700617:tgl */ wa_masked_en(wal, GEN9_CS_DEBUG_MODE1,(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hindex
8e25dd15a2ec..499eb0a4ad3aQuoted 47 lines
Quoted 47 lines
Quoted 47 lines
100644
drivers/gpu/drm/i915/i915_drv.h +33
-5@@ -1572,12 +1572,41 @@ extern const struct i915_rev_steppings kbl_revids[]; #define IS_EHL_REVID(p, since, until) \ (IS_ELKHARTLAKE(p) && IS_REVID(p, since, until)) -#define TGL_REVID_A0 0x0 -#define TGL_REVID_B0 0x1 -#define TGL_REVID_C0 0x2 +enum { +TGL_REVID_A0 , +TGL_REVID_B0 , +TGL_REVID_B1 , +TGL_REVID_C0 , +TGL_REVID_D0 , +}; + +extern const struct i915_rev_steppings tgl_uy_revids[];extern const +struct i915_rev_steppings tgl_revids[]; + +static inline const struct i915_rev_steppings *tgl_revids_get (struct +drm_i915_private *dev_priv) { +if (IS_TGL_U (dev_priv) ||IS_TGL_Y (dev_priv)) +return tgl_uy_revids; +else +return tgl_revids; +} -#define IS_TGL_REVID (p, since, until) \ - (IS_TIGERLAKE(p) && IS_REVID(p, since, until)) +#define IS_TGL_DISP_REVID (p, since, until) \ + (IS_TIGERLAKE(p) && \ + tgl_revids_get(p)->disp_stepping >= (since) && \ + tgl_revids_get(p)->disp_stepping <= (until)) + +#define IS_TGL_UY_GT_REVID (p, since, until) \ + ((IS_TGL_U(p) || IS_TGL_Y(p)) && \ + tgl_uy_revids->gt_stepping >= (since) && \ + tgl_uy_revids->gt_stepping <= (until)) + +#define IS_TGL_GT_REVID (p, since, until) \ + (IS_TIGERLAKE(p) && \ + !(IS_TGL_U(p) || IS_TGL_Y(p)) && \ + tgl_revids->gt_stepping >= (since) && \ + tgl_revids->gt_stepping <= (until))
Quoted 29 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0#define RKL_REVID_A0 0x0#define RKL_REVID_B0 0x1(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_pm.cindex
b4bd19266b8c..34e0d22d456bQuoted 24 lines
Quoted 24 lines
drivers/gpu/drm/i915/intel_pm.c static void tgl_init_clock_gating(struct
Quoted 4 lines
100644
drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -7136,7 +7136,7 @@ static void tgl_init_clock_gating(struct
drm_i915_private*dev_priv)drivers/gpu/drm/i915/intel_pm.c static void tgl_init_clock_gating(struct drm_i915_private *dev_priv)
Quoted 6 lines
drivers/gpu/drm/i915/intel_pm.c +1
-1I915_READ(POWERGATE_ENABLE) | vd_pg_enable);/* Wa_1409825376:tgl (pre-prod)*/ -if (IS_TGL_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_A0 )) +if (IS_TGL_DISP_REVID (dev_priv,TGL_REVID_A0 ,TGL_REVID_B1 )) I915_WRITE(GEN9_CLKGATE_DIS_3,
I915_READ(GEN9_CLKGATE_DIS_3)|drivers/gpu/drm/i915/intel_pm.c static void tgl_init_clock_gating(struct drm_i915_private *dev_priv) · line 7142
Quoted 3 lines
drivers/gpu/drm/i915/intel_pm.c +0
-0TGL_VRH_GATING_DIS);_______________________________________________
Intel-gfx mailing list
[email protected]
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx