* [Intel-gfx] [PATCH] Copy highest enabled wm level to disabled wm levels for gen >= 12
@ 2022-12-19 7:29 Stanislav Lisovskiy
2022-12-19 8:19 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Stanislav Lisovskiy @ 2022-12-19 7:29 UTC (permalink / raw)
To: intel-gfx
There was a specific SW workaround requested, which should prevent
some watermark issues happening, which requires copying highest
enabled wm level to those disabled wm levels(bit 31 is of course
still needs to be cleared).
Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
---
drivers/gpu/drm/i915/display/skl_watermark.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index ae4e9e680c2e3..b12e11cd6e579 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -1591,6 +1591,13 @@ skl_crtc_allocate_plane_ddb(struct intel_atomic_state *state,
wm->wm[level].lines = wm->wm[0].lines;
wm->wm[level].ignore_lines = wm->wm[0].ignore_lines;
}
+
+ /* Wa_14017887344 */
+ if (DISPLAY_VER(i915) >= 12 && level > 0) {
+ wm->wm[level].blocks = wm->wm[level - 1].blocks;
+ wm->wm[level].lines = wm->wm[level - 1].lines;
+ wm->wm[level].ignore_lines = wm->wm[level - 1].ignore_lines;
+ }
}
}
--
2.37.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Intel-gfx] ✓ Fi.CI.BAT: success for Copy highest enabled wm level to disabled wm levels for gen >= 12 2022-12-19 7:29 [Intel-gfx] [PATCH] Copy highest enabled wm level to disabled wm levels for gen >= 12 Stanislav Lisovskiy @ 2022-12-19 8:19 ` Patchwork 2022-12-19 9:51 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 2022-12-20 11:19 ` [Intel-gfx] [PATCH] " Ville Syrjälä 2 siblings, 0 replies; 5+ messages in thread From: Patchwork @ 2022-12-19 8:19 UTC (permalink / raw) To: Stanislav Lisovskiy; +Cc: intel-gfx [-- Attachment #1: Type: text/plain, Size: 4346 bytes --] == Series Details == Series: Copy highest enabled wm level to disabled wm levels for gen >= 12 URL : https://patchwork.freedesktop.org/series/112039/ State : success == Summary == CI Bug Log - changes from CI_DRM_12513 -> Patchwork_112039v1 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/index.html Participating hosts (41 -> 41) ------------------------------ No changes in participating hosts Known issues ------------ Here are the changes found in Patchwork_112039v1 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_exec_suspend@basic-s3@smem: - fi-rkl-11600: NOTRUN -> [FAIL][1] ([fdo#103375]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/fi-rkl-11600/igt@gem_exec_suspend@basic-s3@smem.html * igt@i915_module_load@load: - fi-kbl-soraka: [PASS][2] -> [DMESG-WARN][3] ([i915#1982]) [2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/fi-kbl-soraka/igt@i915_module_load@load.html [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/fi-kbl-soraka/igt@i915_module_load@load.html * igt@i915_selftest@live@guc_hang: - fi-kbl-soraka: [PASS][4] -> [INCOMPLETE][5] ([i915#7640]) [4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/fi-kbl-soraka/igt@i915_selftest@live@guc_hang.html [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/fi-kbl-soraka/igt@i915_selftest@live@guc_hang.html * igt@kms_chamelium@common-hpd-after-suspend: - fi-hsw-4770: NOTRUN -> [SKIP][6] ([fdo#109271] / [fdo#111827]) [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/fi-hsw-4770/igt@kms_chamelium@common-hpd-after-suspend.html - fi-rkl-11600: NOTRUN -> [SKIP][7] ([fdo#111827]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/fi-rkl-11600/igt@kms_chamelium@common-hpd-after-suspend.html #### Possible fixes #### * igt@i915_selftest@live@hangcheck: - fi-hsw-4770: [INCOMPLETE][8] ([i915#4785]) -> [PASS][9] [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/fi-hsw-4770/igt@i915_selftest@live@hangcheck.html [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/fi-hsw-4770/igt@i915_selftest@live@hangcheck.html * igt@i915_suspend@basic-s3-without-i915: - fi-rkl-11600: [INCOMPLETE][10] ([i915#4817]) -> [PASS][11] [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/fi-rkl-11600/igt@i915_suspend@basic-s3-without-i915.html [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/fi-rkl-11600/igt@i915_suspend@basic-s3-without-i915.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375 [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827 [i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982 [i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312 [i915#4785]: https://gitlab.freedesktop.org/drm/intel/issues/4785 [i915#4817]: https://gitlab.freedesktop.org/drm/intel/issues/4817 [i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983 [i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367 [i915#6997]: https://gitlab.freedesktop.org/drm/intel/issues/6997 [i915#7640]: https://gitlab.freedesktop.org/drm/intel/issues/7640 [i915#7699]: https://gitlab.freedesktop.org/drm/intel/issues/7699 Build changes ------------- * Linux: CI_DRM_12513 -> Patchwork_112039v1 CI-20190529: 20190529 CI_DRM_12513: bac367fdc42d61f6ccbb94875e381e37d8104215 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_7096: f2f515390fb11554d22c7b78b94e288026545326 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git Patchwork_112039v1: bac367fdc42d61f6ccbb94875e381e37d8104215 @ git://anongit.freedesktop.org/gfx-ci/linux ### Linux commits 3a142cc31be6 Copy highest enabled wm level to disabled wm levels for gen >= 12 == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/index.html [-- Attachment #2: Type: text/html, Size: 4854 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for Copy highest enabled wm level to disabled wm levels for gen >= 12 2022-12-19 7:29 [Intel-gfx] [PATCH] Copy highest enabled wm level to disabled wm levels for gen >= 12 Stanislav Lisovskiy 2022-12-19 8:19 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork @ 2022-12-19 9:51 ` Patchwork 2022-12-20 11:19 ` [Intel-gfx] [PATCH] " Ville Syrjälä 2 siblings, 0 replies; 5+ messages in thread From: Patchwork @ 2022-12-19 9:51 UTC (permalink / raw) To: Stanislav Lisovskiy; +Cc: intel-gfx [-- Attachment #1: Type: text/plain, Size: 22098 bytes --] == Series Details == Series: Copy highest enabled wm level to disabled wm levels for gen >= 12 URL : https://patchwork.freedesktop.org/series/112039/ State : success == Summary == CI Bug Log - changes from CI_DRM_12513_full -> Patchwork_112039v1_full ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/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_112039v1_full: ### IGT changes ### #### Suppressed #### The following results come from untrusted machines, tests, or statuses. They do not affect the overall result. * igt@gem_lmem_swapping@parallel-random-verify@lmem0: - {shard-dg1}: [PASS][1] -> [DMESG-WARN][2] [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-dg1-14/igt@gem_lmem_swapping@parallel-random-verify@lmem0.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-dg1-17/igt@gem_lmem_swapping@parallel-random-verify@lmem0.html * igt@kms_atomic_transition@plane-all-transition-nonblocking-fencing: - {shard-tglu}: NOTRUN -> [SKIP][3] +5 similar issues [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-tglu-6/igt@kms_atomic_transition@plane-all-transition-nonblocking-fencing.html * igt@kms_big_fb@linear-32bpp-rotate-270: - {shard-tglu}: [SKIP][4] ([fdo#111614]) -> [SKIP][5] [4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-tglu-2/igt@kms_big_fb@linear-32bpp-rotate-270.html [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-tglu-6/igt@kms_big_fb@linear-32bpp-rotate-270.html * igt@kms_ccs@pipe-a-crc-sprite-planes-basic-y_tiled_gen12_mc_ccs: - {shard-tglu}: [SKIP][6] ([i915#3689] / [i915#3886]) -> [SKIP][7] +1 similar issue [6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-tglu-2/igt@kms_ccs@pipe-a-crc-sprite-planes-basic-y_tiled_gen12_mc_ccs.html [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-tglu-6/igt@kms_ccs@pipe-a-crc-sprite-planes-basic-y_tiled_gen12_mc_ccs.html * igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_rc_ccs: - {shard-tglu}: [PASS][8] -> [SKIP][9] +20 similar issues [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-tglu-2/igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_rc_ccs.html [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-tglu-6/igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_rc_ccs.html * igt@kms_ccs@pipe-d-bad-pixel-format-y_tiled_ccs: - {shard-tglu}: [SKIP][10] ([i915#3689]) -> [SKIP][11] +4 similar issues [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-tglu-2/igt@kms_ccs@pipe-d-bad-pixel-format-y_tiled_ccs.html [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-tglu-6/igt@kms_ccs@pipe-d-bad-pixel-format-y_tiled_ccs.html * igt@kms_content_protection@type1: - {shard-tglu}: [SKIP][12] ([i915#7116] / [i915#7118]) -> [SKIP][13] [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-tglu-2/igt@kms_content_protection@type1.html [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-tglu-6/igt@kms_content_protection@type1.html * igt@kms_hdr@static-swap: - {shard-tglu}: [SKIP][14] ([i915#3555]) -> [SKIP][15] [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-tglu-2/igt@kms_hdr@static-swap.html [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-tglu-6/igt@kms_hdr@static-swap.html Known issues ------------ Here are the changes found in Patchwork_112039v1_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_exec_fair@basic-deadline: - shard-glk: [PASS][16] -> [FAIL][17] ([i915#2846]) [16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-glk4/igt@gem_exec_fair@basic-deadline.html [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-glk6/igt@gem_exec_fair@basic-deadline.html * igt@gem_exec_fair@basic-none-share@rcs0: - shard-glk: [PASS][18] -> [FAIL][19] ([i915#2842]) [18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-glk3/igt@gem_exec_fair@basic-none-share@rcs0.html [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-glk4/igt@gem_exec_fair@basic-none-share@rcs0.html * igt@gem_exec_fair@basic-none@rcs0: - shard-glk: NOTRUN -> [FAIL][20] ([i915#2842]) [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-glk1/igt@gem_exec_fair@basic-none@rcs0.html * igt@gem_lmem_swapping@parallel-random: - shard-glk: NOTRUN -> [SKIP][21] ([fdo#109271] / [i915#4613]) +1 similar issue [21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-glk5/igt@gem_lmem_swapping@parallel-random.html * igt@kms_ccs@pipe-a-bad-aux-stride-y_tiled_gen12_rc_ccs_cc: - shard-glk: NOTRUN -> [SKIP][22] ([fdo#109271] / [i915#3886]) +7 similar issues [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-glk5/igt@kms_ccs@pipe-a-bad-aux-stride-y_tiled_gen12_rc_ccs_cc.html * igt@kms_chamelium@dp-hpd-enable-disable-mode: - shard-glk: NOTRUN -> [SKIP][23] ([fdo#109271] / [fdo#111827]) +6 similar issues [23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-glk1/igt@kms_chamelium@dp-hpd-enable-disable-mode.html * igt@kms_fbcon_fbt@fbc: - shard-glk: NOTRUN -> [FAIL][24] ([i915#4767]) [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-glk1/igt@kms_fbcon_fbt@fbc.html * igt@kms_plane_alpha_blend@alpha-transparent-fb@pipe-b-hdmi-a-2: - shard-glk: NOTRUN -> [FAIL][25] ([i915#4573]) +2 similar issues [25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-glk1/igt@kms_plane_alpha_blend@alpha-transparent-fb@pipe-b-hdmi-a-2.html * igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-5@pipe-c-hdmi-a-1: - shard-glk: NOTRUN -> [SKIP][26] ([fdo#109271]) +102 similar issues [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-glk1/igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-5@pipe-c-hdmi-a-1.html * igt@kms_psr2_sf@cursor-plane-update-sf: - shard-glk: NOTRUN -> [SKIP][27] ([fdo#109271] / [i915#658]) +1 similar issue [27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-glk5/igt@kms_psr2_sf@cursor-plane-update-sf.html * igt@kms_writeback@writeback-pixel-formats: - shard-glk: NOTRUN -> [SKIP][28] ([fdo#109271] / [i915#2437]) [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-glk5/igt@kms_writeback@writeback-pixel-formats.html * igt@sysfs_clients@busy: - shard-glk: NOTRUN -> [SKIP][29] ([fdo#109271] / [i915#2994]) +1 similar issue [29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-glk1/igt@sysfs_clients@busy.html #### Possible fixes #### * igt@fbdev@nullptr: - {shard-rkl}: [SKIP][30] ([i915#2582]) -> [PASS][31] [30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-rkl-3/igt@fbdev@nullptr.html [31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-rkl-6/igt@fbdev@nullptr.html * igt@gem_ctx_exec@basic-nohangcheck: - {shard-tglu-9}: [FAIL][32] ([i915#6268]) -> [PASS][33] [32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-tglu-9/igt@gem_ctx_exec@basic-nohangcheck.html [33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-tglu-9/igt@gem_ctx_exec@basic-nohangcheck.html * igt@gem_exec_fair@basic-none-share@rcs0: - {shard-tglu-9}: [FAIL][34] ([i915#2842]) -> [PASS][35] [34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-tglu-9/igt@gem_exec_fair@basic-none-share@rcs0.html [35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-tglu-9/igt@gem_exec_fair@basic-none-share@rcs0.html * igt@gem_exec_fair@basic-none-solo@rcs0: - {shard-rkl}: [FAIL][36] ([i915#2842]) -> [PASS][37] [36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-rkl-2/igt@gem_exec_fair@basic-none-solo@rcs0.html [37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-rkl-2/igt@gem_exec_fair@basic-none-solo@rcs0.html * igt@gem_exec_reloc@basic-cpu-gtt-noreloc: - {shard-rkl}: [SKIP][38] ([i915#3281]) -> [PASS][39] +9 similar issues [38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-rkl-4/igt@gem_exec_reloc@basic-cpu-gtt-noreloc.html [39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-rkl-5/igt@gem_exec_reloc@basic-cpu-gtt-noreloc.html * igt@gem_pread@snoop: - {shard-rkl}: [SKIP][40] ([i915#3282]) -> [PASS][41] +1 similar issue [40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-rkl-4/igt@gem_pread@snoop.html [41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-rkl-5/igt@gem_pread@snoop.html * igt@gen9_exec_parse@bb-chained: - {shard-rkl}: [SKIP][42] ([i915#2527]) -> [PASS][43] +2 similar issues [42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-rkl-4/igt@gen9_exec_parse@bb-chained.html [43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-rkl-5/igt@gen9_exec_parse@bb-chained.html * igt@i915_pm_rpm@cursor: - {shard-rkl}: [SKIP][44] ([i915#1849]) -> [PASS][45] [44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-rkl-1/igt@i915_pm_rpm@cursor.html [45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-rkl-6/igt@i915_pm_rpm@cursor.html * igt@i915_pm_rpm@i2c: - {shard-rkl}: [SKIP][46] ([fdo#109308]) -> [PASS][47] [46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-rkl-3/igt@i915_pm_rpm@i2c.html [47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-rkl-6/igt@i915_pm_rpm@i2c.html * igt@i915_pm_rpm@modeset-lpsp: - {shard-rkl}: [SKIP][48] ([i915#1397]) -> [PASS][49] [48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-rkl-1/igt@i915_pm_rpm@modeset-lpsp.html [49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-rkl-6/igt@i915_pm_rpm@modeset-lpsp.html * igt@kms_ccs@pipe-b-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc: - {shard-rkl}: [SKIP][50] ([i915#1845] / [i915#4098]) -> [PASS][51] +17 similar issues [50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-rkl-3/igt@kms_ccs@pipe-b-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc.html [51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-rkl-6/igt@kms_ccs@pipe-b-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc.html * igt@kms_flip@plain-flip-ts-check-interruptible@b-hdmi-a1: - shard-glk: [FAIL][52] ([i915#2122]) -> [PASS][53] [52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-glk2/igt@kms_flip@plain-flip-ts-check-interruptible@b-hdmi-a1.html [53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-glk8/igt@kms_flip@plain-flip-ts-check-interruptible@b-hdmi-a1.html * igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-render: - {shard-rkl}: [SKIP][54] ([i915#1849] / [i915#4098]) -> [PASS][55] +17 similar issues [54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-rkl-3/igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-render.html [55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-rkl-6/igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-render.html * igt@kms_plane@plane-position-hole@pipe-b-planes: - {shard-rkl}: [SKIP][56] ([i915#3558]) -> [PASS][57] +3 similar issues [56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-rkl-3/igt@kms_plane@plane-position-hole@pipe-b-planes.html [57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-rkl-6/igt@kms_plane@plane-position-hole@pipe-b-planes.html * igt@kms_psr@primary_mmap_gtt: - {shard-rkl}: [SKIP][58] ([i915#1072]) -> [PASS][59] +2 similar issues [58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-rkl-1/igt@kms_psr@primary_mmap_gtt.html [59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-rkl-6/igt@kms_psr@primary_mmap_gtt.html * igt@perf@stress-open-close: - shard-glk: [INCOMPLETE][60] ([i915#5213]) -> [PASS][61] [60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-glk7/igt@perf@stress-open-close.html [61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-glk5/igt@perf@stress-open-close.html * igt@prime_vgem@basic-fence-flip: - {shard-rkl}: [SKIP][62] ([fdo#109295] / [i915#3708] / [i915#4098]) -> [PASS][63] [62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12513/shard-rkl-3/igt@prime_vgem@basic-fence-flip.html [63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112039v1/shard-rkl-6/igt@prime_vgem@basic-fence-flip.html {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 [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#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285 [fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289 [fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295 [fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308 [fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312 [fdo#109314]: https://bugs.freedesktop.org/show_bug.cgi?id=109314 [fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315 [fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642 [fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189 [fdo#110542]: https://bugs.freedesktop.org/show_bug.cgi?id=110542 [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 [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#1850]: https://gitlab.freedesktop.org/drm/intel/issues/1850 [i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982 [i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122 [i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190 [i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437 [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#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842 [i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846 [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#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116 [i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281 [i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282 [i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297 [i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299 [i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359 [i915#3536]: https://gitlab.freedesktop.org/drm/intel/issues/3536 [i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546 [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#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886 [i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955 [i915#3989]: https://gitlab.freedesktop.org/drm/intel/issues/3989 [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#4171]: https://gitlab.freedesktop.org/drm/intel/issues/4171 [i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270 [i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454 [i915#4573]: https://gitlab.freedesktop.org/drm/intel/issues/4573 [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#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176 [i915#5213]: https://gitlab.freedesktop.org/drm/intel/issues/5213 [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#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289 [i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325 [i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533 [i915#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439 [i915#5461]: https://gitlab.freedesktop.org/drm/intel/issues/5461 [i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095 [i915#6117]: https://gitlab.freedesktop.org/drm/intel/issues/6117 [i915#6230]: https://gitlab.freedesktop.org/drm/intel/issues/6230 [i915#6247]: https://gitlab.freedesktop.org/drm/intel/issues/6247 [i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248 [i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268 [i915#6301]: https://gitlab.freedesktop.org/drm/intel/issues/6301 [i915#6334]: https://gitlab.freedesktop.org/drm/intel/issues/6334 [i915#6335]: https://gitlab.freedesktop.org/drm/intel/issues/6335 [i915#6344]: https://gitlab.freedesktop.org/drm/intel/issues/6344 [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#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944 [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#7128]: https://gitlab.freedesktop.org/drm/intel/issues/7128 [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#7681]: https://gitlab.freedesktop.org/drm/intel/issues/7681 [i915#7688]: https://gitlab.freedesktop.org/drm/intel/issues/7688 [i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697 [i915#7701]: https://gitlab.freedesktop.org/drm/intel/issues/7701 Build changes ------------- * Linux: CI_DRM_12513 -> Patchwork_112039v1 * Piglit: piglit_4509 -> None CI-20190529: 20190529 CI_DRM_12513: bac367fdc42d61f6ccbb94875e381e37d8104215 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_7096: f2f515390fb11554d22c7b78b94e288026545326 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git Patchwork_112039v1: bac367fdc42d61f6ccbb94875e381e37d8104215 @ 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_112039v1/index.html [-- Attachment #2: Type: text/html, Size: 18868 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH] Copy highest enabled wm level to disabled wm levels for gen >= 12 2022-12-19 7:29 [Intel-gfx] [PATCH] Copy highest enabled wm level to disabled wm levels for gen >= 12 Stanislav Lisovskiy 2022-12-19 8:19 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork 2022-12-19 9:51 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork @ 2022-12-20 11:19 ` Ville Syrjälä 2023-01-10 14:55 ` Lisovskiy, Stanislav 2 siblings, 1 reply; 5+ messages in thread From: Ville Syrjälä @ 2022-12-20 11:19 UTC (permalink / raw) To: Stanislav Lisovskiy; +Cc: intel-gfx On Mon, Dec 19, 2022 at 09:29:19AM +0200, Stanislav Lisovskiy wrote: > There was a specific SW workaround requested, which should prevent > some watermark issues happening, which requires copying highest > enabled wm level to those disabled wm levels(bit 31 is of course > still needs to be cleared). > > Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> > --- > drivers/gpu/drm/i915/display/skl_watermark.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c > index ae4e9e680c2e3..b12e11cd6e579 100644 > --- a/drivers/gpu/drm/i915/display/skl_watermark.c > +++ b/drivers/gpu/drm/i915/display/skl_watermark.c > @@ -1591,6 +1591,13 @@ skl_crtc_allocate_plane_ddb(struct intel_atomic_state *state, > wm->wm[level].lines = wm->wm[0].lines; > wm->wm[level].ignore_lines = wm->wm[0].ignore_lines; > } > + > + /* Wa_14017887344 */ > + if (DISPLAY_VER(i915) >= 12 && level > 0) { > + wm->wm[level].blocks = wm->wm[level - 1].blocks; > + wm->wm[level].lines = wm->wm[level - 1].lines; > + wm->wm[level].ignore_lines = wm->wm[level - 1].ignore_lines; > + } Hmm. Reading the parent hsd this smells at least partially as some kind of race in the Windows driver between async flip, wm1+ disable, and the PSR wm level override behaviour. We never do async flip + wm1+ disable from the same commit which itself might be sufficient to avoid the issue. I didn't think that even worked, but maybe it sort of does if Windows attempts it. However since we don't do that we might never hit this. Not sure. The PSR wm level override stuff we don't handle at all currently. I'm thinking that is something we should remedy first. Also while thinking about how to unify this and the already existing wm1 w/a I realized that we don't check if the wm level is actually enabled or not. So it's interfering with commit a301cb0fca2d ("drm/i915: Keep plane watermarks enabled more aggressively"). My gut reaction is that we want a wm[level].enable check there, but I've not fully thought through the implications... > } > } > > -- > 2.37.3 -- Ville Syrjälä Intel ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH] Copy highest enabled wm level to disabled wm levels for gen >= 12 2022-12-20 11:19 ` [Intel-gfx] [PATCH] " Ville Syrjälä @ 2023-01-10 14:55 ` Lisovskiy, Stanislav 0 siblings, 0 replies; 5+ messages in thread From: Lisovskiy, Stanislav @ 2023-01-10 14:55 UTC (permalink / raw) To: Ville Syrjälä; +Cc: intel-gfx On Tue, Dec 20, 2022 at 01:19:54PM +0200, Ville Syrjälä wrote: > On Mon, Dec 19, 2022 at 09:29:19AM +0200, Stanislav Lisovskiy wrote: > > There was a specific SW workaround requested, which should prevent > > some watermark issues happening, which requires copying highest > > enabled wm level to those disabled wm levels(bit 31 is of course > > still needs to be cleared). > > > > Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> > > --- > > drivers/gpu/drm/i915/display/skl_watermark.c | 7 +++++++ > > 1 file changed, 7 insertions(+) > > > > diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c > > index ae4e9e680c2e3..b12e11cd6e579 100644 > > --- a/drivers/gpu/drm/i915/display/skl_watermark.c > > +++ b/drivers/gpu/drm/i915/display/skl_watermark.c > > @@ -1591,6 +1591,13 @@ skl_crtc_allocate_plane_ddb(struct intel_atomic_state *state, > > wm->wm[level].lines = wm->wm[0].lines; > > wm->wm[level].ignore_lines = wm->wm[0].ignore_lines; > > } > > + > > + /* Wa_14017887344 */ > > + if (DISPLAY_VER(i915) >= 12 && level > 0) { > > + wm->wm[level].blocks = wm->wm[level - 1].blocks; > > + wm->wm[level].lines = wm->wm[level - 1].lines; > > + wm->wm[level].ignore_lines = wm->wm[level - 1].ignore_lines; > > + } > > Hmm. Reading the parent hsd this smells at least partially as > some kind of race in the Windows driver between async flip, > wm1+ disable, and the PSR wm level override behaviour. > > We never do async flip + wm1+ disable from the same commit > which itself might be sufficient to avoid the issue. I > didn't think that even worked, but maybe it sort of does > if Windows attempts it. However since we don't do that we > might never hit this. Not sure. > > The PSR wm level override stuff we don't handle at all > currently. I'm thinking that is something we should > remedy first. > > Also while thinking about how to unify this and the > already existing wm1 w/a I realized that we don't > check if the wm level is actually enabled or not. > So it's interfering with commit a301cb0fca2d ("drm/i915: > Keep plane watermarks enabled more aggressively"). > My gut reaction is that we want a wm[level].enable > check there, but I've not fully thought through the > implications... As I understand in order for this W/A to become essential, following conditions should be combined: 1) We are doing async flips, with all WM levels > 0 being disabled(this all 0's are written to wm level registers) 2) PSR optimization has to be turned on(controlled in CHICKEN_DCPR_1 reg) This optimization enables the highest possible WM level, when PSR is used. This seems to get into contradiction with 1). We have actually already this W/A implemented to disable that optimization for small vblanks, however as I understand it isn't always enabled (it is enabled only for DG1/TGL for some reason in our code) so that's why we also set those WM level regs to some sane values. But could be that we need to limit it to async flips only? Stan > > > } > > } > > > > -- > > 2.37.3 > > -- > Ville Syrjälä > Intel ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-01-10 14:55 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-12-19 7:29 [Intel-gfx] [PATCH] Copy highest enabled wm level to disabled wm levels for gen >= 12 Stanislav Lisovskiy 2022-12-19 8:19 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork 2022-12-19 9:51 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 2022-12-20 11:19 ` [Intel-gfx] [PATCH] " Ville Syrjälä 2023-01-10 14:55 ` Lisovskiy, Stanislav
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox