| Message ID | 20200305181204.28856-1-swathi.dhanavanthri@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/tgl: Make wa_1606700617 permanent | expand |
On Thu, 2020-03-05 at 10:12 -0800, Swathi Dhanavanthri wrote: > This workaround is to disable FF DOP Clock gating. The fix > in B0 was backed out due to timing reasons and decided to > be made permanent. > Bspec: 52890 Reviewed-by: José Roberto de Souza <jose.souza@intel.com> > > Signed-off-by: Swathi Dhanavanthri <swathi.dhanavanthri@intel.com> > --- > drivers/gpu/drm/i915/gt/intel_workarounds.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c > b/drivers/gpu/drm/i915/gt/intel_workarounds.c > index cb7d85c42f13..a9d1975b5245 100644 > --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c > +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c > @@ -1337,11 +1337,6 @@ 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)) { > - /* Wa_1606700617:tgl */ > - wa_masked_en(wal, > - GEN9_CS_DEBUG_MODE1, > - FF_DOP_CLOCK_GATE_DISABLE); > - > /* > * Wa_1607138336:tgl > * Wa_1607063988:tgl > @@ -1393,6 +1388,11 @@ rcs_engine_wa_init(struct intel_engine_cs > *engine, struct i915_wa_list *wal) > /* Wa_1409804808:tgl */ > wa_masked_en(wal, GEN7_ROW_CHICKEN2, > GEN12_PUSH_CONST_DEREF_HOLD_DIS); > + > + /* Wa_1606700617:tgl */ > + wa_masked_en(wal, > + GEN9_CS_DEBUG_MODE1, > + FF_DOP_CLOCK_GATE_DISABLE); > } > > if (IS_GEN(i915, 11)) {
On Fri, 2020-03-06 at 20:03 +0000, Patchwork wrote: > == Series Details == > > Series: drm/i915/tgl: Make wa_1606700617 permanent (rev2) > URL : https://patchwork.freedesktop.org/series/74240/ > State : success > > == Summary == > > CI Bug Log - changes from CI_DRM_8073_full -> Patchwork_16844_full > ==================================================== > > Summary > ------- > > **SUCCESS** > > No regressions found. Pushed to dinq, thanks for the patch. > > > > Known issues > ------------ > > Here are the changes found in Patchwork_16844_full that come from > known issues: > > ### IGT changes ### > > #### Issues hit #### > > * igt@gem_ctx_isolation@rcs0-s3: > - shard-kbl: [PASS][1] -> [DMESG-WARN][2] ([i915#180]) > +3 similar issues > [1]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-kbl4/igt@gem_ctx_isolation@rcs0-s3.html > [2]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-kbl2/igt@gem_ctx_isolation@rcs0-s3.html > > * igt@gem_exec_schedule@implicit-both-bsd1: > - shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#109276] / > [i915#677]) +1 similar issue > [3]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-iclb1/igt@gem_exec_schedule@implicit-both-bsd1.html > [4]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-iclb6/igt@gem_exec_schedule@implicit-both-bsd1.html > > * igt@gem_exec_schedule@implicit-read-write-bsd: > - shard-iclb: [PASS][5] -> [SKIP][6] ([i915#677]) > [5]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-iclb5/igt@gem_exec_schedule@implicit-read-write-bsd.html > [6]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-iclb1/igt@gem_exec_schedule@implicit-read-write-bsd.html > > * igt@gem_exec_schedule@preempt-queue-contexts-chain-bsd: > - shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#112146]) +2 > similar issues > [7]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-iclb8/igt@gem_exec_schedule@preempt-queue-contexts-chain-bsd.html > [8]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-iclb2/igt@gem_exec_schedule@preempt-queue-contexts-chain-bsd.html > > * igt@gem_exec_schedule@promotion-bsd1: > - shard-iclb: [PASS][9] -> [SKIP][10] ([fdo#109276]) +7 > similar issues > [9]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-iclb2/igt@gem_exec_schedule@promotion-bsd1.html > [10]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-iclb5/igt@gem_exec_schedule@promotion-bsd1.html > > * igt@gem_ppgtt@flink-and-close-vma-leak: > - shard-skl: [PASS][11] -> [FAIL][12] ([i915#644]) > [11]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-skl6/igt@gem_ppgtt@flink-and-close-vma-leak.html > [12]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-skl6/igt@gem_ppgtt@flink-and-close-vma-leak.html > > * igt@i915_pm_rps@waitboost: > - shard-iclb: [PASS][13] -> [FAIL][14] ([i915#413]) > [13]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-iclb3/igt@i915_pm_rps@waitboost.html > [14]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-iclb6/igt@i915_pm_rps@waitboost.html > > * igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic: > - shard-glk: [PASS][15] -> [FAIL][16] ([i915#72]) > [15]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-glk9/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic.html > [16]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-glk1/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic.html > > * igt@kms > _cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size: > - shard-skl: [PASS][17] -> [FAIL][18] ([IGT#5] / > [i915#697]) > [17]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-skl6/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html > [18]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-skl6/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html > > * igt@kms_flip@flip-vs-suspend: > - shard-apl: [PASS][19] -> [DMESG-WARN][20] ([i915#180]) > [19]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-apl3/igt@kms_flip@flip-vs-suspend.html > [20]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-apl8/igt@kms_flip@flip-vs-suspend.html > > * igt@kms_flip_tiling@flip-yf-tiled: > - shard-skl: [PASS][21] -> [FAIL][22] ([fdo#108145]) > [21]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-skl7/igt@kms_flip_tiling@flip-yf-tiled.html > [22]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-skl7/igt@kms_flip_tiling@flip-yf-tiled.html > > * igt@kms_psr@psr2_no_drrs: > - shard-iclb: [PASS][23] -> [SKIP][24] ([fdo#109441]) +2 > similar issues > [23]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-iclb2/igt@kms_psr@psr2_no_drrs.html > [24]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-iclb5/igt@kms_psr@psr2_no_drrs.html > > * igt@perf_pmu@busy-vcs1: > - shard-iclb: [PASS][25] -> [SKIP][26] ([fdo#112080]) +10 > similar issues > [25]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-iclb4/igt@perf_pmu@busy-vcs1.html > [26]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-iclb7/igt@perf_pmu@busy-vcs1.html > > > #### Possible fixes #### > > * igt@gem_busy@busy-vcs1: > - shard-iclb: [SKIP][27] ([fdo#112080]) -> [PASS][28] +13 > similar issues > [27]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-iclb3/igt@gem_busy@busy-vcs1.html > [28]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-iclb1/igt@gem_busy@busy-vcs1.html > > * igt@gem_ctx_shared@exec-shared-gtt-render: > - shard-tglb: [FAIL][29] ([i915#607] / [i915#616]) -> > [PASS][30] > [29]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-tglb5/igt@gem_ctx_shared@exec-shared-gtt-render.html > [30]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-tglb7/igt@gem_ctx_shared@exec-shared-gtt-render.html > > * igt@gem_exec_schedule@implicit-both-bsd: > - shard-iclb: [SKIP][31] ([i915#677]) -> [PASS][32] > [31]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-iclb4/igt@gem_exec_schedule@implicit-both-bsd.html > [32]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-iclb7/igt@gem_exec_schedule@implicit-both-bsd.html > > * igt@gem_exec_schedule@preemptive-hang-bsd: > - shard-iclb: [SKIP][33] ([fdo#112146]) -> [PASS][34] +4 > similar issues > [33]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-iclb2/igt@gem_exec_schedule@preemptive-hang-bsd.html > [34]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-iclb5/igt@gem_exec_schedule@preemptive-hang-bsd.html > > * igt@gem_ppgtt@flink-and-close-vma-leak: > - shard-iclb: [FAIL][35] ([i915#644]) -> [PASS][36] > [35]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-iclb7/igt@gem_ppgtt@flink-and-close-vma-leak.html > [36]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-iclb4/igt@gem_ppgtt@flink-and-close-vma-leak.html > > * igt@i915_suspend@fence-restore-tiled2untiled: > - shard-skl: [INCOMPLETE][37] ([i915#69]) -> [PASS][38] > [37]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-skl6/igt@i915_suspend@fence-restore-tiled2untiled.html > [38]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-skl9/igt@i915_suspend@fence-restore-tiled2untiled.html > > * igt@i915_suspend@sysfs-reader: > - shard-kbl: [DMESG-WARN][39] ([i915#180]) -> [PASS][40] > +4 similar issues > [39]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-kbl7/igt@i915_suspend@sysfs-reader.html > [40]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-kbl6/igt@i915_suspend@sysfs-reader.html > > * igt@kms_flip@flip-vs-suspend-interruptible: > - shard-hsw: [INCOMPLETE][41] ([i915#61]) -> [PASS][42] > [41]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-hsw2/igt@kms_flip@flip-vs-suspend-interruptible.html > [42]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-hsw2/igt@kms_flip@flip-vs-suspend-interruptible.html > > * igt@kms_hdr@bpc-switch-suspend: > - shard-apl: [DMESG-WARN][43] ([i915#180]) -> [PASS][44] > +2 similar issues > [43]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-apl1/igt@kms_hdr@bpc-switch-suspend.html > [44]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-apl3/igt@kms_hdr@bpc-switch-suspend.html > - shard-skl: [FAIL][45] ([i915#1188]) -> [PASS][46] > [45]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-skl9/igt@kms_hdr@bpc-switch-suspend.html > [46]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-skl10/igt@kms_hdr@bpc-switch-suspend.html > > * igt@kms_psr@no_drrs: > - shard-iclb: [FAIL][47] ([i915#173]) -> [PASS][48] > [47]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-iclb1/igt@kms_psr@no_drrs.html > [48]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-iclb2/igt@kms_psr@no_drrs.html > > * igt@kms_psr@psr2_sprite_blt: > - shard-iclb: [SKIP][49] ([fdo#109441]) -> [PASS][50] > [49]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-iclb8/igt@kms_psr@psr2_sprite_blt.html > [50]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-iclb2/igt@kms_psr@psr2_sprite_blt.html > > * igt@kms_setmode@basic: > - shard-apl: [FAIL][51] ([i915#31]) -> [PASS][52] > [51]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-apl1/igt@kms_setmode@basic.html > [52]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-apl4/igt@kms_setmode@basic.html > > * igt@prime_busy@hang-bsd2: > - shard-iclb: [SKIP][53] ([fdo#109276]) -> [PASS][54] +14 > similar issues > [53]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-iclb3/igt@prime_busy@hang-bsd2.html > [54]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-iclb1/igt@prime_busy@hang-bsd2.html > > > #### Warnings #### > > * igt@gem_exec_schedule@pi-userfault-bsd: > - shard-iclb: [SKIP][55] ([i915#677]) -> [INCOMPLETE][56] > ([i915#1381]) > [55]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-iclb1/igt@gem_exec_schedule@pi-userfault-bsd.html > [56]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-iclb6/igt@gem_exec_schedule@pi-userfault-bsd.html > > * igt@gem_userptr_blits@sync-unmap-cycles: > - shard-hsw: [DMESG-WARN][57] ([fdo#111870]) -> [DMESG- > WARN][58] ([fdo#110789] / [fdo#111870]) > [57]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-hsw6/igt@gem_userptr_blits@sync-unmap-cycles.html > [58]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-hsw2/igt@gem_userptr_blits@sync-unmap-cycles.html > > * igt@i915_pm_dc@dc6-dpms: > - shard-tglb: [FAIL][59] ([i915#454]) -> [SKIP][60] > ([i915#468]) > [59]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8073/shard-tglb3/igt@i915_pm_dc@dc6-dpms.html > [60]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16844/shard-tglb2/igt@i915_pm_dc@dc6-dpms.html > > > [IGT#5]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/5 > [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145 > [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276 > [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441 > [fdo#110789]: https://bugs.freedesktop.org/show_bug.cgi?id=110789 > [fdo#111870]: https://bugs.freedesktop.org/show_bug.cgi?id=111870 > [fdo#112080]: https://bugs.freedesktop.org/show_bug.cgi?id=112080 > [fdo#112146]: https://bugs.freedesktop.org/show_bug.cgi?id=112146 > [i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188 > [i915#1381]: https://gitlab.freedesktop.org/drm/intel/issues/1381 > [i915#173]: https://gitlab.freedesktop.org/drm/intel/issues/173 > [i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180 > [i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31 > [i915#413]: https://gitlab.freedesktop.org/drm/intel/issues/413 > [i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454 > [i915#468]: https://gitlab.freedesktop.org/drm/intel/issues/468 > [i915#607]: https://gitlab.freedesktop.org/drm/intel/issues/607 > [i915#61]: https://gitlab.freedesktop.org/drm/intel/issues/61 > [i915#616]: https://gitlab.freedesktop.org/drm/intel/issues/616 > [i915#644]: https://gitlab.freedesktop.org/drm/intel/issues/644 > [i915#677]: https://gitlab.freedesktop.org/drm/intel/issues/677 > [i915#69]: https://gitlab.freedesktop.org/drm/intel/issues/69 > [i915#697]: https://gitlab.freedesktop.org/drm/intel/issues/697 > [i915#72]: https://gitlab.freedesktop.org/drm/intel/issues/72 > > > Participating hosts (10 -> 10) > ------------------------------ > > No changes in participating hosts > > > Build changes > ------------- > > * CI: CI-20190529 -> None > * Linux: CI_DRM_8073 -> Patchwork_16844 > > CI-20190529: 20190529 > CI_DRM_8073: 04042aee59126471bb37cec526ccaf44b4e8d506 @ > git://anongit.freedesktop.org/gfx-ci/linux > IGT_5495: 22df72de8affcec22d9f354bb6148d77f60cc580 @ > git://anongit.freedesktop.org/xorg/app/intel-gpu-tools > Patchwork_16844: 2591b1a7af9885a30547116c8baddea7f6d5b537 @ > 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_16844/index.html > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c index cb7d85c42f13..a9d1975b5245 100644 --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -1337,11 +1337,6 @@ 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)) { - /* Wa_1606700617:tgl */ - wa_masked_en(wal, - GEN9_CS_DEBUG_MODE1, - FF_DOP_CLOCK_GATE_DISABLE); - /* * Wa_1607138336:tgl * Wa_1607063988:tgl @@ -1393,6 +1388,11 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) /* Wa_1409804808:tgl */ wa_masked_en(wal, GEN7_ROW_CHICKEN2, GEN12_PUSH_CONST_DEREF_HOLD_DIS); + + /* Wa_1606700617:tgl */ + wa_masked_en(wal, + GEN9_CS_DEBUG_MODE1, + FF_DOP_CLOCK_GATE_DISABLE); } if (IS_GEN(i915, 11)) {
This workaround is to disable FF DOP Clock gating. The fix in B0 was backed out due to timing reasons and decided to be made permanent. Bspec: 52890 Signed-off-by: Swathi Dhanavanthri <swathi.dhanavanthri@intel.com> --- drivers/gpu/drm/i915/gt/intel_workarounds.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)