* [PATCH] drm/dp_mst: Avoid deleting payloads for connectors staying enabled
@ 2022-09-07 14:25 ` Imre Deak
0 siblings, 0 replies; 8+ messages in thread
From: Imre Deak @ 2022-09-07 14:25 UTC (permalink / raw)
To: intel-gfx, dri-devel
When an MST connector stays enabled during a commit the connector's MST
state needs to be added to the atomic state, but the corresponding MST
payload allocation shouldn't be set for deletion; fix such modesets by
ensuring the above even if the connector was already enabled before the
modeset.
The issue led to the following:
[ 761.992923] i915 0000:00:02.0: drm_WARN_ON(payload->delete)
[ 761.992949] WARNING: CPU: 6 PID: 1401 at drivers/gpu/drm/display/drm_dp_mst_topology.c:4221 drm_dp_atomic_find_time_slots+0x236/0x280 [drm_display_helper]
[ 761.992955] Modules linked in: snd_hda_intel i915 drm_buddy drm_display_helper drm_kms_helper ttm drm snd_hda_codec_hdmi snd_intel_dspcfg snd_hda_codec snd_hwdep snd_hda_core snd_pcm prime_numbers i2c_algo_bit syscopyarea sysfillrect sysimgblt fb_sys_fops x86_pkg_temp_thermal cdc_ether coretemp crct10dif_pclmul usbnet crc32_pclmul mii ghash_clmulni_intel e1000e mei_me ptp i2c_i801 pps_core mei i2c_smbus intel_lpss_pci fuse [last unloaded: drm]
[ 761.992986] CPU: 6 PID: 1401 Comm: testdisplay Tainted: G U 6.0.0-rc4-imre+ #565
[ 761.992989] Hardware name: Intel Corporation Alder Lake Client Platform/AlderLake-P DDR5 RVP, BIOS ADLPFWI1.R00.3135.A00.2203251419 03/25/2022
[ 761.992990] RIP: 0010:drm_dp_atomic_find_time_slots+0x236/0x280 [drm_display_helper]
[ 761.992994] Code: 4c 8b 67 50 4d 85 e4 75 03 4c 8b 27 e8 03 28 4e e1 48 c7 c1 8b 26 2c a0 4c 89 e2 48 c7 c7 a8 26 2c a0 48 89 c6 e8 31 d5 88 e1 <0f> 0b 49 8b 85 d0 00 00 00 4c 89 fa 48 c7 c6 a0 41 2c a0 48 8b 78
[ 761.992995] RSP: 0018:ffffc9000177ba60 EFLAGS: 00010286
[ 761.992998] RAX: 0000000000000000 RBX: ffff88810d2f1540 RCX: 0000000000000000
[ 761.992999] RDX: 0000000000000001 RSI: ffffffff82368a25 RDI: 00000000ffffffff
[ 761.993000] RBP: ffff888142299d80 R08: ffff8884adbfdfe8 R09: 00000000ffefffff
[ 761.993001] R10: ffff8884a6bfe000 R11: ffff8884ac443c30 R12: ffff888102972f90
[ 761.993002] R13: ffff8881163e2cf0 R14: 00000000000003ac R15: ffff88810c501000
[ 761.993003] FS: 00007f81e4c459c0(0000) GS:ffff888496500000(0000) knlGS:0000000000000000
[ 761.993004] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 761.993005] CR2: 0000555dac962a98 CR3: 0000000123a34006 CR4: 0000000000770ee0
[ 761.993006] PKRU: 55555554
[ 761.993007] Call Trace:
[ 761.993009] <TASK>
[ 761.993012] intel_dp_mst_compute_config+0x19a/0x350 [i915]
[ 761.993090] intel_atomic_check+0xf37/0x3180 [i915]
[ 761.993168] drm_atomic_check_only+0x5d3/0xa60 [drm]
[ 761.993182] drm_atomic_commit+0x56/0xc0 [drm]
[ 761.993192] ? drm_plane_get_damage_clips.cold+0x1c/0x1c [drm]
[ 761.993204] drm_atomic_helper_set_config+0x78/0xc0 [drm_kms_helper]
[ 761.993214] drm_mode_setcrtc+0x1ed/0x750 [drm]
[ 761.993232] ? drm_mode_getcrtc+0x180/0x180 [drm]
[ 761.993241] drm_ioctl_kernel+0xb5/0x150 [drm]
[ 761.993252] drm_ioctl+0x203/0x3d0 [drm]
[ 761.993261] ? drm_mode_getcrtc+0x180/0x180 [drm]
[ 761.993276] __x64_sys_ioctl+0x8a/0xb0
[ 761.993281] do_syscall_64+0x38/0x90
[ 761.993285] entry_SYSCALL_64_after_hwframe+0x63/0xcd
[ 761.993287] RIP: 0033:0x7f81e551aaff
[ 761.993288] Code: 00 48 89 44 24 18 31 c0 48 8d 44 24 60 c7 04 24 10 00 00 00 48 89 44 24 08 48 8d 44 24 20 48 89 44 24 10 b8 10 00 00 00 0f 05 <41> 89 c0 3d 00 f0 ff ff 77 1f 48 8b 44 24 18 64 48 2b 04 25 28 00
[ 761.993290] RSP: 002b:00007fff4304af10 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
[ 761.993292] RAX: ffffffffffffffda RBX: 00007fff4304afa0 RCX: 00007f81e551aaff
[ 761.993293] RDX: 00007fff4304afa0 RSI: 00000000c06864a2 RDI: 0000000000000004
[ 761.993294] RBP: 00000000c06864a2 R08: 0000000000000000 R09: 0000555dac8a9c68
[ 761.993294] R10: 0000000000000000 R11: 0000000000000246 R12: 00000000000008c4
[ 761.993295] R13: 0000000000000004 R14: 0000555dac8a9c68 R15: 00007fff4304b098
[ 761.993301] </TASK>
Fixes: 083351e96386 ("drm/display/dp_mst: Fix modeset tracking in drm_dp_atomic_release_vcpi_slots()")
Testcase: igt@testdisplay
Cc: Lyude Paul <lyude@redhat.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
drivers/gpu/drm/display/drm_dp_mst_topology.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c
index 1de438151cc39..4442cc5602d45 100644
--- a/drivers/gpu/drm/display/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c
@@ -4322,6 +4322,9 @@ int drm_dp_atomic_release_time_slots(struct drm_atomic_state *state,
return -EINVAL;
}
+ if (new_conn_state->crtc)
+ return 0;
+
drm_dbg_atomic(mgr->dev, "[MST PORT:%p] TU %d -> 0\n", port, payload->time_slots);
if (!payload->delete) {
drm_dp_mst_put_port_malloc(port);
--
2.37.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Intel-gfx] [PATCH] drm/dp_mst: Avoid deleting payloads for connectors staying enabled
@ 2022-09-07 14:25 ` Imre Deak
0 siblings, 0 replies; 8+ messages in thread
From: Imre Deak @ 2022-09-07 14:25 UTC (permalink / raw)
To: intel-gfx, dri-devel
When an MST connector stays enabled during a commit the connector's MST
state needs to be added to the atomic state, but the corresponding MST
payload allocation shouldn't be set for deletion; fix such modesets by
ensuring the above even if the connector was already enabled before the
modeset.
The issue led to the following:
[ 761.992923] i915 0000:00:02.0: drm_WARN_ON(payload->delete)
[ 761.992949] WARNING: CPU: 6 PID: 1401 at drivers/gpu/drm/display/drm_dp_mst_topology.c:4221 drm_dp_atomic_find_time_slots+0x236/0x280 [drm_display_helper]
[ 761.992955] Modules linked in: snd_hda_intel i915 drm_buddy drm_display_helper drm_kms_helper ttm drm snd_hda_codec_hdmi snd_intel_dspcfg snd_hda_codec snd_hwdep snd_hda_core snd_pcm prime_numbers i2c_algo_bit syscopyarea sysfillrect sysimgblt fb_sys_fops x86_pkg_temp_thermal cdc_ether coretemp crct10dif_pclmul usbnet crc32_pclmul mii ghash_clmulni_intel e1000e mei_me ptp i2c_i801 pps_core mei i2c_smbus intel_lpss_pci fuse [last unloaded: drm]
[ 761.992986] CPU: 6 PID: 1401 Comm: testdisplay Tainted: G U 6.0.0-rc4-imre+ #565
[ 761.992989] Hardware name: Intel Corporation Alder Lake Client Platform/AlderLake-P DDR5 RVP, BIOS ADLPFWI1.R00.3135.A00.2203251419 03/25/2022
[ 761.992990] RIP: 0010:drm_dp_atomic_find_time_slots+0x236/0x280 [drm_display_helper]
[ 761.992994] Code: 4c 8b 67 50 4d 85 e4 75 03 4c 8b 27 e8 03 28 4e e1 48 c7 c1 8b 26 2c a0 4c 89 e2 48 c7 c7 a8 26 2c a0 48 89 c6 e8 31 d5 88 e1 <0f> 0b 49 8b 85 d0 00 00 00 4c 89 fa 48 c7 c6 a0 41 2c a0 48 8b 78
[ 761.992995] RSP: 0018:ffffc9000177ba60 EFLAGS: 00010286
[ 761.992998] RAX: 0000000000000000 RBX: ffff88810d2f1540 RCX: 0000000000000000
[ 761.992999] RDX: 0000000000000001 RSI: ffffffff82368a25 RDI: 00000000ffffffff
[ 761.993000] RBP: ffff888142299d80 R08: ffff8884adbfdfe8 R09: 00000000ffefffff
[ 761.993001] R10: ffff8884a6bfe000 R11: ffff8884ac443c30 R12: ffff888102972f90
[ 761.993002] R13: ffff8881163e2cf0 R14: 00000000000003ac R15: ffff88810c501000
[ 761.993003] FS: 00007f81e4c459c0(0000) GS:ffff888496500000(0000) knlGS:0000000000000000
[ 761.993004] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 761.993005] CR2: 0000555dac962a98 CR3: 0000000123a34006 CR4: 0000000000770ee0
[ 761.993006] PKRU: 55555554
[ 761.993007] Call Trace:
[ 761.993009] <TASK>
[ 761.993012] intel_dp_mst_compute_config+0x19a/0x350 [i915]
[ 761.993090] intel_atomic_check+0xf37/0x3180 [i915]
[ 761.993168] drm_atomic_check_only+0x5d3/0xa60 [drm]
[ 761.993182] drm_atomic_commit+0x56/0xc0 [drm]
[ 761.993192] ? drm_plane_get_damage_clips.cold+0x1c/0x1c [drm]
[ 761.993204] drm_atomic_helper_set_config+0x78/0xc0 [drm_kms_helper]
[ 761.993214] drm_mode_setcrtc+0x1ed/0x750 [drm]
[ 761.993232] ? drm_mode_getcrtc+0x180/0x180 [drm]
[ 761.993241] drm_ioctl_kernel+0xb5/0x150 [drm]
[ 761.993252] drm_ioctl+0x203/0x3d0 [drm]
[ 761.993261] ? drm_mode_getcrtc+0x180/0x180 [drm]
[ 761.993276] __x64_sys_ioctl+0x8a/0xb0
[ 761.993281] do_syscall_64+0x38/0x90
[ 761.993285] entry_SYSCALL_64_after_hwframe+0x63/0xcd
[ 761.993287] RIP: 0033:0x7f81e551aaff
[ 761.993288] Code: 00 48 89 44 24 18 31 c0 48 8d 44 24 60 c7 04 24 10 00 00 00 48 89 44 24 08 48 8d 44 24 20 48 89 44 24 10 b8 10 00 00 00 0f 05 <41> 89 c0 3d 00 f0 ff ff 77 1f 48 8b 44 24 18 64 48 2b 04 25 28 00
[ 761.993290] RSP: 002b:00007fff4304af10 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
[ 761.993292] RAX: ffffffffffffffda RBX: 00007fff4304afa0 RCX: 00007f81e551aaff
[ 761.993293] RDX: 00007fff4304afa0 RSI: 00000000c06864a2 RDI: 0000000000000004
[ 761.993294] RBP: 00000000c06864a2 R08: 0000000000000000 R09: 0000555dac8a9c68
[ 761.993294] R10: 0000000000000000 R11: 0000000000000246 R12: 00000000000008c4
[ 761.993295] R13: 0000000000000004 R14: 0000555dac8a9c68 R15: 00007fff4304b098
[ 761.993301] </TASK>
Fixes: 083351e96386 ("drm/display/dp_mst: Fix modeset tracking in drm_dp_atomic_release_vcpi_slots()")
Testcase: igt@testdisplay
Cc: Lyude Paul <lyude@redhat.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
drivers/gpu/drm/display/drm_dp_mst_topology.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c
index 1de438151cc39..4442cc5602d45 100644
--- a/drivers/gpu/drm/display/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c
@@ -4322,6 +4322,9 @@ int drm_dp_atomic_release_time_slots(struct drm_atomic_state *state,
return -EINVAL;
}
+ if (new_conn_state->crtc)
+ return 0;
+
drm_dbg_atomic(mgr->dev, "[MST PORT:%p] TU %d -> 0\n", port, payload->time_slots);
if (!payload->delete) {
drm_dp_mst_put_port_malloc(port);
--
2.37.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/dp_mst: Avoid deleting payloads for connectors staying enabled
2022-09-07 14:25 ` [Intel-gfx] " Imre Deak
(?)
@ 2022-09-07 15:18 ` Patchwork
-1 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2022-09-07 15:18 UTC (permalink / raw)
To: Imre Deak; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 10594 bytes --]
== Series Details ==
Series: drm/dp_mst: Avoid deleting payloads for connectors staying enabled
URL : https://patchwork.freedesktop.org/series/108250/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12088 -> Patchwork_108250v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/index.html
Participating hosts (43 -> 43)
------------------------------
Additional (1): fi-rkl-11600
Missing (1): fi-bdw-samus
Known issues
------------
Here are the changes found in Patchwork_108250v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_huc_copy@huc-copy:
- fi-rkl-11600: NOTRUN -> [SKIP][1] ([i915#2190])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-rkl-11600/igt@gem_huc_copy@huc-copy.html
* igt@gem_lmem_swapping@basic:
- fi-rkl-11600: NOTRUN -> [SKIP][2] ([i915#4613]) +3 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-rkl-11600/igt@gem_lmem_swapping@basic.html
* igt@gem_tiled_pread_basic:
- fi-rkl-11600: NOTRUN -> [SKIP][3] ([i915#3282])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-rkl-11600/igt@gem_tiled_pread_basic.html
* igt@i915_pm_backlight@basic-brightness:
- fi-rkl-11600: NOTRUN -> [SKIP][4] ([i915#3012])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-rkl-11600/igt@i915_pm_backlight@basic-brightness.html
* igt@i915_pm_rpm@module-reload:
- fi-cfl-8109u: [PASS][5] -> [DMESG-FAIL][6] ([i915#62])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/fi-cfl-8109u/igt@i915_pm_rpm@module-reload.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-cfl-8109u/igt@i915_pm_rpm@module-reload.html
* igt@i915_selftest@live@gem:
- fi-blb-e6850: NOTRUN -> [DMESG-FAIL][7] ([i915#4528])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-blb-e6850/igt@i915_selftest@live@gem.html
* igt@i915_selftest@live@late_gt_pm:
- fi-cfl-8109u: [PASS][8] -> [DMESG-WARN][9] ([i915#5904]) +30 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/fi-cfl-8109u/igt@i915_selftest@live@late_gt_pm.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-cfl-8109u/igt@i915_selftest@live@late_gt_pm.html
* igt@i915_selftest@live@requests:
- fi-pnv-d510: [PASS][10] -> [DMESG-FAIL][11] ([i915#4528])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/fi-pnv-d510/igt@i915_selftest@live@requests.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-pnv-d510/igt@i915_selftest@live@requests.html
* igt@i915_suspend@basic-s2idle-without-i915:
- fi-cfl-8109u: [PASS][12] -> [DMESG-WARN][13] ([i915#5904] / [i915#62])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/fi-cfl-8109u/igt@i915_suspend@basic-s2idle-without-i915.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-cfl-8109u/igt@i915_suspend@basic-s2idle-without-i915.html
* igt@i915_suspend@basic-s3-without-i915:
- fi-rkl-11600: NOTRUN -> [INCOMPLETE][14] ([i915#5982])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-rkl-11600/igt@i915_suspend@basic-s3-without-i915.html
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-hsw-4770: NOTRUN -> [SKIP][15] ([fdo#109271] / [fdo#111827])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-hsw-4770/igt@kms_chamelium@common-hpd-after-suspend.html
- fi-rkl-guc: NOTRUN -> [SKIP][16] ([fdo#111827])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-rkl-guc/igt@kms_chamelium@common-hpd-after-suspend.html
* igt@kms_chamelium@hdmi-edid-read:
- fi-rkl-11600: NOTRUN -> [SKIP][17] ([fdo#111827]) +7 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-rkl-11600/igt@kms_chamelium@hdmi-edid-read.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor:
- fi-rkl-11600: NOTRUN -> [SKIP][18] ([i915#4103])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-rkl-11600/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
* igt@kms_force_connector_basic@force-load-detect:
- fi-rkl-11600: NOTRUN -> [SKIP][19] ([fdo#109285] / [i915#4098])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-rkl-11600/igt@kms_force_connector_basic@force-load-detect.html
* igt@kms_frontbuffer_tracking@basic:
- fi-cfl-8109u: [PASS][20] -> [DMESG-WARN][21] ([i915#62]) +12 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/fi-cfl-8109u/igt@kms_frontbuffer_tracking@basic.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-cfl-8109u/igt@kms_frontbuffer_tracking@basic.html
* igt@kms_psr@primary_page_flip:
- fi-rkl-11600: NOTRUN -> [SKIP][22] ([i915#1072]) +3 similar issues
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-rkl-11600/igt@kms_psr@primary_page_flip.html
* igt@kms_setmode@basic-clone-single-crtc:
- fi-rkl-11600: NOTRUN -> [SKIP][23] ([i915#3555] / [i915#4098])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-rkl-11600/igt@kms_setmode@basic-clone-single-crtc.html
* igt@prime_vgem@basic-read:
- fi-rkl-11600: NOTRUN -> [SKIP][24] ([fdo#109295] / [i915#3291] / [i915#3708]) +2 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-rkl-11600/igt@prime_vgem@basic-read.html
* igt@prime_vgem@basic-userptr:
- fi-rkl-11600: NOTRUN -> [SKIP][25] ([fdo#109295] / [i915#3301] / [i915#3708])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-rkl-11600/igt@prime_vgem@basic-userptr.html
* igt@runner@aborted:
- fi-pnv-d510: NOTRUN -> [FAIL][26] ([fdo#109271] / [i915#2403] / [i915#4312])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-pnv-d510/igt@runner@aborted.html
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s0@smem:
- {bat-rplp-1}: [DMESG-WARN][27] ([i915#2867]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/bat-rplp-1/igt@gem_exec_suspend@basic-s0@smem.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/bat-rplp-1/igt@gem_exec_suspend@basic-s0@smem.html
* igt@i915_selftest@live@hangcheck:
- fi-hsw-4770: [INCOMPLETE][29] ([i915#4785]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/fi-hsw-4770/igt@i915_selftest@live@hangcheck.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-hsw-4770/igt@i915_selftest@live@hangcheck.html
* igt@i915_selftest@live@requests:
- fi-blb-e6850: [DMESG-FAIL][31] ([i915#4528]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/fi-blb-e6850/igt@i915_selftest@live@requests.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-blb-e6850/igt@i915_selftest@live@requests.html
* igt@i915_selftest@live@workarounds:
- fi-rkl-guc: [INCOMPLETE][33] ([i915#4983]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/fi-rkl-guc/igt@i915_selftest@live@workarounds.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/fi-rkl-guc/igt@i915_selftest@live@workarounds.html
* igt@kms_flip@basic-flip-vs-dpms@b-dp5:
- {bat-rpls-2}: [DMESG-WARN][35] ([i915#6730]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/bat-rpls-2/igt@kms_flip@basic-flip-vs-dpms@b-dp5.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/bat-rpls-2/igt@kms_flip@basic-flip-vs-dpms@b-dp5.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#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2403]: https://gitlab.freedesktop.org/drm/intel/issues/2403
[i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
[i915#3012]: https://gitlab.freedesktop.org/drm/intel/issues/3012
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4528]: https://gitlab.freedesktop.org/drm/intel/issues/4528
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4785]: https://gitlab.freedesktop.org/drm/intel/issues/4785
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5904]: https://gitlab.freedesktop.org/drm/intel/issues/5904
[i915#5982]: https://gitlab.freedesktop.org/drm/intel/issues/5982
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#6257]: https://gitlab.freedesktop.org/drm/intel/issues/6257
[i915#6380]: https://gitlab.freedesktop.org/drm/intel/issues/6380
[i915#6730]: https://gitlab.freedesktop.org/drm/intel/issues/6730
Build changes
-------------
* Linux: CI_DRM_12088 -> Patchwork_108250v1
CI-20190529: 20190529
CI_DRM_12088: 3a1b2f4abc391edf8a58ff90fa9908ce0abac22c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6648: 3c9079c0b97445fbfc903b9c5a1d69707b80af80 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_108250v1: 3a1b2f4abc391edf8a58ff90fa9908ce0abac22c @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
4911f2a543e8 drm/dp_mst: Avoid deleting payloads for connectors staying enabled
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/index.html
[-- Attachment #2: Type: text/html, Size: 12441 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] drm/dp_mst: Avoid deleting payloads for connectors staying enabled
2022-09-07 14:25 ` [Intel-gfx] " Imre Deak
@ 2022-09-07 18:23 ` Lyude Paul
-1 siblings, 0 replies; 8+ messages in thread
From: Lyude Paul @ 2022-09-07 18:23 UTC (permalink / raw)
To: Imre Deak, intel-gfx, dri-devel
Surprised this didn't come up on Intel's CI (or at least it certainly didn't
when the series that introduced this was tested), thanks for the catch!
Reviewed-by: Lyude Paul <lyude@redhat.com>
On Wed, 2022-09-07 at 17:25 +0300, Imre Deak wrote:
> When an MST connector stays enabled during a commit the connector's MST
> state needs to be added to the atomic state, but the corresponding MST
> payload allocation shouldn't be set for deletion; fix such modesets by
> ensuring the above even if the connector was already enabled before the
> modeset.
>
> The issue led to the following:
> [ 761.992923] i915 0000:00:02.0: drm_WARN_ON(payload->delete)
> [ 761.992949] WARNING: CPU: 6 PID: 1401 at drivers/gpu/drm/display/drm_dp_mst_topology.c:4221 drm_dp_atomic_find_time_slots+0x236/0x280 [drm_display_helper]
> [ 761.992955] Modules linked in: snd_hda_intel i915 drm_buddy drm_display_helper drm_kms_helper ttm drm snd_hda_codec_hdmi snd_intel_dspcfg snd_hda_codec snd_hwdep snd_hda_core snd_pcm prime_numbers i2c_algo_bit syscopyarea sysfillrect sysimgblt fb_sys_fops x86_pkg_temp_thermal cdc_ether coretemp crct10dif_pclmul usbnet crc32_pclmul mii ghash_clmulni_intel e1000e mei_me ptp i2c_i801 pps_core mei i2c_smbus intel_lpss_pci fuse [last unloaded: drm]
> [ 761.992986] CPU: 6 PID: 1401 Comm: testdisplay Tainted: G U 6.0.0-rc4-imre+ #565
> [ 761.992989] Hardware name: Intel Corporation Alder Lake Client Platform/AlderLake-P DDR5 RVP, BIOS ADLPFWI1.R00.3135.A00.2203251419 03/25/2022
> [ 761.992990] RIP: 0010:drm_dp_atomic_find_time_slots+0x236/0x280 [drm_display_helper]
> [ 761.992994] Code: 4c 8b 67 50 4d 85 e4 75 03 4c 8b 27 e8 03 28 4e e1 48 c7 c1 8b 26 2c a0 4c 89 e2 48 c7 c7 a8 26 2c a0 48 89 c6 e8 31 d5 88 e1 <0f> 0b 49 8b 85 d0 00 00 00 4c 89 fa 48 c7 c6 a0 41 2c a0 48 8b 78
> [ 761.992995] RSP: 0018:ffffc9000177ba60 EFLAGS: 00010286
> [ 761.992998] RAX: 0000000000000000 RBX: ffff88810d2f1540 RCX: 0000000000000000
> [ 761.992999] RDX: 0000000000000001 RSI: ffffffff82368a25 RDI: 00000000ffffffff
> [ 761.993000] RBP: ffff888142299d80 R08: ffff8884adbfdfe8 R09: 00000000ffefffff
> [ 761.993001] R10: ffff8884a6bfe000 R11: ffff8884ac443c30 R12: ffff888102972f90
> [ 761.993002] R13: ffff8881163e2cf0 R14: 00000000000003ac R15: ffff88810c501000
> [ 761.993003] FS: 00007f81e4c459c0(0000) GS:ffff888496500000(0000) knlGS:0000000000000000
> [ 761.993004] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> [ 761.993005] CR2: 0000555dac962a98 CR3: 0000000123a34006 CR4: 0000000000770ee0
> [ 761.993006] PKRU: 55555554
> [ 761.993007] Call Trace:
> [ 761.993009] <TASK>
> [ 761.993012] intel_dp_mst_compute_config+0x19a/0x350 [i915]
> [ 761.993090] intel_atomic_check+0xf37/0x3180 [i915]
> [ 761.993168] drm_atomic_check_only+0x5d3/0xa60 [drm]
> [ 761.993182] drm_atomic_commit+0x56/0xc0 [drm]
> [ 761.993192] ? drm_plane_get_damage_clips.cold+0x1c/0x1c [drm]
> [ 761.993204] drm_atomic_helper_set_config+0x78/0xc0 [drm_kms_helper]
> [ 761.993214] drm_mode_setcrtc+0x1ed/0x750 [drm]
> [ 761.993232] ? drm_mode_getcrtc+0x180/0x180 [drm]
> [ 761.993241] drm_ioctl_kernel+0xb5/0x150 [drm]
> [ 761.993252] drm_ioctl+0x203/0x3d0 [drm]
> [ 761.993261] ? drm_mode_getcrtc+0x180/0x180 [drm]
> [ 761.993276] __x64_sys_ioctl+0x8a/0xb0
> [ 761.993281] do_syscall_64+0x38/0x90
> [ 761.993285] entry_SYSCALL_64_after_hwframe+0x63/0xcd
> [ 761.993287] RIP: 0033:0x7f81e551aaff
> [ 761.993288] Code: 00 48 89 44 24 18 31 c0 48 8d 44 24 60 c7 04 24 10 00 00 00 48 89 44 24 08 48 8d 44 24 20 48 89 44 24 10 b8 10 00 00 00 0f 05 <41> 89 c0 3d 00 f0 ff ff 77 1f 48 8b 44 24 18 64 48 2b 04 25 28 00
> [ 761.993290] RSP: 002b:00007fff4304af10 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
> [ 761.993292] RAX: ffffffffffffffda RBX: 00007fff4304afa0 RCX: 00007f81e551aaff
> [ 761.993293] RDX: 00007fff4304afa0 RSI: 00000000c06864a2 RDI: 0000000000000004
> [ 761.993294] RBP: 00000000c06864a2 R08: 0000000000000000 R09: 0000555dac8a9c68
> [ 761.993294] R10: 0000000000000000 R11: 0000000000000246 R12: 00000000000008c4
> [ 761.993295] R13: 0000000000000004 R14: 0000555dac8a9c68 R15: 00007fff4304b098
> [ 761.993301] </TASK>
>
> Fixes: 083351e96386 ("drm/display/dp_mst: Fix modeset tracking in drm_dp_atomic_release_vcpi_slots()")
> Testcase: igt@testdisplay
> Cc: Lyude Paul <lyude@redhat.com>
> Signed-off-by: Imre Deak <imre.deak@intel.com>
> ---
> drivers/gpu/drm/display/drm_dp_mst_topology.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c
> index 1de438151cc39..4442cc5602d45 100644
> --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c
> +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c
> @@ -4322,6 +4322,9 @@ int drm_dp_atomic_release_time_slots(struct drm_atomic_state *state,
> return -EINVAL;
> }
>
> + if (new_conn_state->crtc)
> + return 0;
> +
> drm_dbg_atomic(mgr->dev, "[MST PORT:%p] TU %d -> 0\n", port, payload->time_slots);
> if (!payload->delete) {
> drm_dp_mst_put_port_malloc(port);
--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/dp_mst: Avoid deleting payloads for connectors staying enabled
@ 2022-09-07 18:23 ` Lyude Paul
0 siblings, 0 replies; 8+ messages in thread
From: Lyude Paul @ 2022-09-07 18:23 UTC (permalink / raw)
To: Imre Deak, intel-gfx, dri-devel
Surprised this didn't come up on Intel's CI (or at least it certainly didn't
when the series that introduced this was tested), thanks for the catch!
Reviewed-by: Lyude Paul <lyude@redhat.com>
On Wed, 2022-09-07 at 17:25 +0300, Imre Deak wrote:
> When an MST connector stays enabled during a commit the connector's MST
> state needs to be added to the atomic state, but the corresponding MST
> payload allocation shouldn't be set for deletion; fix such modesets by
> ensuring the above even if the connector was already enabled before the
> modeset.
>
> The issue led to the following:
> [ 761.992923] i915 0000:00:02.0: drm_WARN_ON(payload->delete)
> [ 761.992949] WARNING: CPU: 6 PID: 1401 at drivers/gpu/drm/display/drm_dp_mst_topology.c:4221 drm_dp_atomic_find_time_slots+0x236/0x280 [drm_display_helper]
> [ 761.992955] Modules linked in: snd_hda_intel i915 drm_buddy drm_display_helper drm_kms_helper ttm drm snd_hda_codec_hdmi snd_intel_dspcfg snd_hda_codec snd_hwdep snd_hda_core snd_pcm prime_numbers i2c_algo_bit syscopyarea sysfillrect sysimgblt fb_sys_fops x86_pkg_temp_thermal cdc_ether coretemp crct10dif_pclmul usbnet crc32_pclmul mii ghash_clmulni_intel e1000e mei_me ptp i2c_i801 pps_core mei i2c_smbus intel_lpss_pci fuse [last unloaded: drm]
> [ 761.992986] CPU: 6 PID: 1401 Comm: testdisplay Tainted: G U 6.0.0-rc4-imre+ #565
> [ 761.992989] Hardware name: Intel Corporation Alder Lake Client Platform/AlderLake-P DDR5 RVP, BIOS ADLPFWI1.R00.3135.A00.2203251419 03/25/2022
> [ 761.992990] RIP: 0010:drm_dp_atomic_find_time_slots+0x236/0x280 [drm_display_helper]
> [ 761.992994] Code: 4c 8b 67 50 4d 85 e4 75 03 4c 8b 27 e8 03 28 4e e1 48 c7 c1 8b 26 2c a0 4c 89 e2 48 c7 c7 a8 26 2c a0 48 89 c6 e8 31 d5 88 e1 <0f> 0b 49 8b 85 d0 00 00 00 4c 89 fa 48 c7 c6 a0 41 2c a0 48 8b 78
> [ 761.992995] RSP: 0018:ffffc9000177ba60 EFLAGS: 00010286
> [ 761.992998] RAX: 0000000000000000 RBX: ffff88810d2f1540 RCX: 0000000000000000
> [ 761.992999] RDX: 0000000000000001 RSI: ffffffff82368a25 RDI: 00000000ffffffff
> [ 761.993000] RBP: ffff888142299d80 R08: ffff8884adbfdfe8 R09: 00000000ffefffff
> [ 761.993001] R10: ffff8884a6bfe000 R11: ffff8884ac443c30 R12: ffff888102972f90
> [ 761.993002] R13: ffff8881163e2cf0 R14: 00000000000003ac R15: ffff88810c501000
> [ 761.993003] FS: 00007f81e4c459c0(0000) GS:ffff888496500000(0000) knlGS:0000000000000000
> [ 761.993004] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> [ 761.993005] CR2: 0000555dac962a98 CR3: 0000000123a34006 CR4: 0000000000770ee0
> [ 761.993006] PKRU: 55555554
> [ 761.993007] Call Trace:
> [ 761.993009] <TASK>
> [ 761.993012] intel_dp_mst_compute_config+0x19a/0x350 [i915]
> [ 761.993090] intel_atomic_check+0xf37/0x3180 [i915]
> [ 761.993168] drm_atomic_check_only+0x5d3/0xa60 [drm]
> [ 761.993182] drm_atomic_commit+0x56/0xc0 [drm]
> [ 761.993192] ? drm_plane_get_damage_clips.cold+0x1c/0x1c [drm]
> [ 761.993204] drm_atomic_helper_set_config+0x78/0xc0 [drm_kms_helper]
> [ 761.993214] drm_mode_setcrtc+0x1ed/0x750 [drm]
> [ 761.993232] ? drm_mode_getcrtc+0x180/0x180 [drm]
> [ 761.993241] drm_ioctl_kernel+0xb5/0x150 [drm]
> [ 761.993252] drm_ioctl+0x203/0x3d0 [drm]
> [ 761.993261] ? drm_mode_getcrtc+0x180/0x180 [drm]
> [ 761.993276] __x64_sys_ioctl+0x8a/0xb0
> [ 761.993281] do_syscall_64+0x38/0x90
> [ 761.993285] entry_SYSCALL_64_after_hwframe+0x63/0xcd
> [ 761.993287] RIP: 0033:0x7f81e551aaff
> [ 761.993288] Code: 00 48 89 44 24 18 31 c0 48 8d 44 24 60 c7 04 24 10 00 00 00 48 89 44 24 08 48 8d 44 24 20 48 89 44 24 10 b8 10 00 00 00 0f 05 <41> 89 c0 3d 00 f0 ff ff 77 1f 48 8b 44 24 18 64 48 2b 04 25 28 00
> [ 761.993290] RSP: 002b:00007fff4304af10 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
> [ 761.993292] RAX: ffffffffffffffda RBX: 00007fff4304afa0 RCX: 00007f81e551aaff
> [ 761.993293] RDX: 00007fff4304afa0 RSI: 00000000c06864a2 RDI: 0000000000000004
> [ 761.993294] RBP: 00000000c06864a2 R08: 0000000000000000 R09: 0000555dac8a9c68
> [ 761.993294] R10: 0000000000000000 R11: 0000000000000246 R12: 00000000000008c4
> [ 761.993295] R13: 0000000000000004 R14: 0000555dac8a9c68 R15: 00007fff4304b098
> [ 761.993301] </TASK>
>
> Fixes: 083351e96386 ("drm/display/dp_mst: Fix modeset tracking in drm_dp_atomic_release_vcpi_slots()")
> Testcase: igt@testdisplay
> Cc: Lyude Paul <lyude@redhat.com>
> Signed-off-by: Imre Deak <imre.deak@intel.com>
> ---
> drivers/gpu/drm/display/drm_dp_mst_topology.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c
> index 1de438151cc39..4442cc5602d45 100644
> --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c
> +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c
> @@ -4322,6 +4322,9 @@ int drm_dp_atomic_release_time_slots(struct drm_atomic_state *state,
> return -EINVAL;
> }
>
> + if (new_conn_state->crtc)
> + return 0;
> +
> drm_dbg_atomic(mgr->dev, "[MST PORT:%p] TU %d -> 0\n", port, payload->time_slots);
> if (!payload->delete) {
> drm_dp_mst_put_port_malloc(port);
--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/dp_mst: Avoid deleting payloads for connectors staying enabled
2022-09-07 14:25 ` [Intel-gfx] " Imre Deak
` (2 preceding siblings ...)
(?)
@ 2022-09-07 21:44 ` Patchwork
-1 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2022-09-07 21:44 UTC (permalink / raw)
To: Imre Deak; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 17000 bytes --]
== Series Details ==
Series: drm/dp_mst: Avoid deleting payloads for connectors staying enabled
URL : https://patchwork.freedesktop.org/series/108250/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12088_full -> Patchwork_108250v1_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Participating hosts (12 -> 11)
------------------------------
Missing (1): shard-rkl
New tests
---------
New tests have been introduced between CI_DRM_12088_full and Patchwork_108250v1_full:
### New IGT tests (2) ###
* igt@kms_atomic_transition@plane-use-after-nonblocking-unbind-fencing@pipe-a-dp-1:
- Statuses : 1 pass(s)
- Exec time: [0.14] s
* igt@kms_atomic_transition@plane-use-after-nonblocking-unbind-fencing@pipe-b-dp-1:
- Statuses : 1 pass(s)
- Exec time: [0.38] s
Known issues
------------
Here are the changes found in Patchwork_108250v1_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_balancer@parallel:
- shard-iclb: [PASS][1] -> [SKIP][2] ([i915#4525])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-iclb1/igt@gem_exec_balancer@parallel.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-iclb5/igt@gem_exec_balancer@parallel.html
* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-apl: [PASS][3] -> [FAIL][4] ([i915#2842]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-apl8/igt@gem_exec_fair@basic-none-solo@rcs0.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-apl8/igt@gem_exec_fair@basic-none-solo@rcs0.html
* igt@gem_exec_fair@basic-none@vcs0:
- shard-glk: [PASS][5] -> [FAIL][6] ([i915#2842])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-glk1/igt@gem_exec_fair@basic-none@vcs0.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-glk6/igt@gem_exec_fair@basic-none@vcs0.html
* igt@gem_exec_fair@basic-pace@vcs1:
- shard-iclb: NOTRUN -> [FAIL][7] ([i915#2842])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-iclb1/igt@gem_exec_fair@basic-pace@vcs1.html
* igt@i915_suspend@forcewake:
- shard-apl: NOTRUN -> [DMESG-WARN][8] ([i915#180])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-apl8/igt@i915_suspend@forcewake.html
* igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_mc_ccs:
- shard-apl: NOTRUN -> [SKIP][9] ([fdo#109271] / [i915#3886]) +2 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-apl8/igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_mc_ccs.html
* igt@kms_chamelium@dp-frame-dump:
- shard-snb: NOTRUN -> [SKIP][10] ([fdo#109271] / [fdo#111827]) +1 similar issue
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-snb6/igt@kms_chamelium@dp-frame-dump.html
* igt@kms_chamelium@hdmi-edid-read:
- shard-apl: NOTRUN -> [SKIP][11] ([fdo#109271] / [fdo#111827]) +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-apl8/igt@kms_chamelium@hdmi-edid-read.html
* igt@kms_cursor_crc@cursor-suspend@pipe-c-dp-1:
- shard-apl: [PASS][12] -> [DMESG-WARN][13] ([i915#180]) +1 similar issue
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-apl4/igt@kms_cursor_crc@cursor-suspend@pipe-c-dp-1.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-apl3/igt@kms_cursor_crc@cursor-suspend@pipe-c-dp-1.html
* igt@kms_flip@2x-flip-vs-expired-vblank@bc-hdmi-a1-hdmi-a2:
- shard-glk: [PASS][14] -> [FAIL][15] ([i915#79])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-glk7/igt@kms_flip@2x-flip-vs-expired-vblank@bc-hdmi-a1-hdmi-a2.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-glk9/igt@kms_flip@2x-flip-vs-expired-vblank@bc-hdmi-a1-hdmi-a2.html
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs-downscaling@pipe-a-default-mode:
- shard-iclb: NOTRUN -> [SKIP][16] ([i915#2672] / [i915#3555])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-iclb3/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs-downscaling@pipe-a-default-mode.html
* igt@kms_flip_scaled_crc@flip-64bpp-4tile-to-32bpp-4tiledg2rcccs-downscaling@pipe-a-valid-mode:
- shard-iclb: NOTRUN -> [SKIP][17] ([i915#2672]) +5 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-iclb4/igt@kms_flip_scaled_crc@flip-64bpp-4tile-to-32bpp-4tiledg2rcccs-downscaling@pipe-a-valid-mode.html
* igt@kms_flip_scaled_crc@flip-64bpp-xtile-to-16bpp-xtile-downscaling@pipe-a-default-mode:
- shard-iclb: NOTRUN -> [SKIP][18] ([i915#3555])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-iclb2/igt@kms_flip_scaled_crc@flip-64bpp-xtile-to-16bpp-xtile-downscaling@pipe-a-default-mode.html
* igt@kms_plane_scaling@planes-upscale-20x20-downscale-factor-0-5@pipe-b-edp-1:
- shard-iclb: [PASS][19] -> [SKIP][20] ([i915#5235]) +2 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-iclb7/igt@kms_plane_scaling@planes-upscale-20x20-downscale-factor-0-5@pipe-b-edp-1.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-iclb2/igt@kms_plane_scaling@planes-upscale-20x20-downscale-factor-0-5@pipe-b-edp-1.html
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [PASS][21] -> [SKIP][22] ([fdo#109441])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-iclb4/igt@kms_psr@psr2_primary_page_flip.html
* igt@kms_rotation_crc@sprite-rotation-270:
- shard-snb: NOTRUN -> [SKIP][23] ([fdo#109271]) +60 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-snb6/igt@kms_rotation_crc@sprite-rotation-270.html
* igt@perf@stress-open-close:
- shard-glk: [PASS][24] -> [INCOMPLETE][25] ([i915#5213])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-glk3/igt@perf@stress-open-close.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-glk5/igt@perf@stress-open-close.html
* igt@prime_nv_api@i915_self_import_to_different_fd:
- shard-apl: NOTRUN -> [SKIP][26] ([fdo#109271]) +27 similar issues
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-apl8/igt@prime_nv_api@i915_self_import_to_different_fd.html
* igt@sysfs_clients@recycle:
- shard-apl: NOTRUN -> [SKIP][27] ([fdo#109271] / [i915#2994])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-apl8/igt@sysfs_clients@recycle.html
#### Possible fixes ####
* igt@feature_discovery@psr2:
- shard-iclb: [SKIP][28] ([i915#658]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-iclb3/igt@feature_discovery@psr2.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-iclb2/igt@feature_discovery@psr2.html
* igt@gem_ctx_exec@basic-nohangcheck:
- shard-tglb: [FAIL][30] ([i915#6268]) -> [PASS][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-tglb2/igt@gem_ctx_exec@basic-nohangcheck.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-tglb2/igt@gem_ctx_exec@basic-nohangcheck.html
* igt@gem_eio@kms:
- shard-tglb: [FAIL][32] ([i915#5784]) -> [PASS][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-tglb3/igt@gem_eio@kms.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-tglb7/igt@gem_eio@kms.html
* igt@gem_exec_fair@basic-flow@rcs0:
- shard-tglb: [FAIL][34] ([i915#2842]) -> [PASS][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-tglb5/igt@gem_exec_fair@basic-flow@rcs0.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-tglb3/igt@gem_exec_fair@basic-flow@rcs0.html
* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-iclb: [FAIL][36] ([i915#2842]) -> [PASS][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-iclb3/igt@gem_exec_fair@basic-throttle@rcs0.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-iclb2/igt@gem_exec_fair@basic-throttle@rcs0.html
* igt@kms_cursor_legacy@flip-vs-cursor@toggle:
- shard-iclb: [FAIL][38] ([i915#2346]) -> [PASS][39] +2 similar issues
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-iclb7/igt@kms_cursor_legacy@flip-vs-cursor@toggle.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-iclb2/igt@kms_cursor_legacy@flip-vs-cursor@toggle.html
* igt@kms_flip@flip-vs-suspend-interruptible@c-dp1:
- shard-apl: [DMESG-WARN][40] ([i915#180]) -> [PASS][41] +1 similar issue
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-apl6/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-apl8/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html
* igt@kms_plane_scaling@plane-scaler-with-clipping-clamping-pixel-formats@pipe-b-edp-1:
- shard-iclb: [SKIP][42] ([i915#5176]) -> [PASS][43] +1 similar issue
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-iclb3/igt@kms_plane_scaling@plane-scaler-with-clipping-clamping-pixel-formats@pipe-b-edp-1.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-iclb6/igt@kms_plane_scaling@plane-scaler-with-clipping-clamping-pixel-formats@pipe-b-edp-1.html
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [SKIP][44] ([fdo#109441]) -> [PASS][45] +1 similar issue
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-iclb1/igt@kms_psr@psr2_cursor_render.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
* igt@kms_psr_stress_test@invalidate-primary-flip-overlay:
- shard-iclb: [SKIP][46] ([i915#5519]) -> [PASS][47]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-iclb4/igt@kms_psr_stress_test@invalidate-primary-flip-overlay.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-iclb3/igt@kms_psr_stress_test@invalidate-primary-flip-overlay.html
* igt@perf@polling-parameterized:
- shard-glk: [FAIL][48] ([i915#5639]) -> [PASS][49]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-glk9/igt@perf@polling-parameterized.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-glk6/igt@perf@polling-parameterized.html
* igt@perf_pmu@module-unload:
- shard-snb: [DMESG-WARN][50] ([i915#4528]) -> [PASS][51]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-snb4/igt@perf_pmu@module-unload.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-snb6/igt@perf_pmu@module-unload.html
#### Warnings ####
* igt@gem_exec_balancer@parallel-ordering:
- shard-iclb: [FAIL][52] ([i915#6117]) -> [SKIP][53] ([i915#4525])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-iclb1/igt@gem_exec_balancer@parallel-ordering.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-iclb6/igt@gem_exec_balancer@parallel-ordering.html
* igt@kms_psr2_sf@cursor-plane-move-continuous-sf:
- shard-iclb: [SKIP][54] ([i915#2920]) -> [SKIP][55] ([i915#658])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-iclb2/igt@kms_psr2_sf@cursor-plane-move-continuous-sf.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-iclb4/igt@kms_psr2_sf@cursor-plane-move-continuous-sf.html
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area:
- shard-iclb: [SKIP][56] ([i915#2920]) -> [SKIP][57] ([fdo#111068] / [i915#658]) +2 similar issues
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-iclb2/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-iclb1/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area.html
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area:
- shard-iclb: [SKIP][58] ([fdo#111068] / [i915#658]) -> [SKIP][59] ([i915#2920])
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12088/shard-iclb7/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area.html
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108250v1/shard-iclb2/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area.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#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[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#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2530]: https://gitlab.freedesktop.org/drm/intel/issues/2530
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3063]: https://gitlab.freedesktop.org/drm/intel/issues/3063
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3989]: https://gitlab.freedesktop.org/drm/intel/issues/3989
[i915#4525]: https://gitlab.freedesktop.org/drm/intel/issues/4525
[i915#4528]: https://gitlab.freedesktop.org/drm/intel/issues/4528
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[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#5519]: https://gitlab.freedesktop.org/drm/intel/issues/5519
[i915#5639]: https://gitlab.freedesktop.org/drm/intel/issues/5639
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#6117]: https://gitlab.freedesktop.org/drm/intel/issues/6117
[i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
Build changes
-------------
* Linux: CI_DRM_12088 -> Patchwork_108250v1
CI-20190529: 20190529
CI_DRM_12088: 3a1b2f4abc391edf8a58ff90fa9908ce0abac22c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6648: 3c9079c0b97445fbfc903b9c5a1d69707b80af80 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_108250v1: 3a1b2f4abc391edf8a58ff90fa9908ce0abac22c @ 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_108250v1/index.html
[-- Attachment #2: Type: text/html, Size: 18449 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] drm/dp_mst: Avoid deleting payloads for connectors staying enabled
2022-09-07 18:23 ` [Intel-gfx] " Lyude Paul
@ 2022-09-08 9:11 ` Imre Deak
-1 siblings, 0 replies; 8+ messages in thread
From: Imre Deak @ 2022-09-08 9:11 UTC (permalink / raw)
To: Lyude Paul; +Cc: intel-gfx, dri-devel
On Wed, Sep 07, 2022 at 02:23:51PM -0400, Lyude Paul wrote:
> Surprised this didn't come up on Intel's CI (or at least it certainly didn't
> when the series that introduced this was tested),
Yes, this was a problem in CI which didn't have any MST sinks. Now there
is and the problem is visible:
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12093/bat-rpls-2/igt@kms_flip@basic-flip-vs-dpms@b-dp5.html
> thanks for the catch!
>
> Reviewed-by: Lyude Paul <lyude@redhat.com>
Thanks.
> On Wed, 2022-09-07 at 17:25 +0300, Imre Deak wrote:
> > When an MST connector stays enabled during a commit the connector's MST
> > state needs to be added to the atomic state, but the corresponding MST
> > payload allocation shouldn't be set for deletion; fix such modesets by
> > ensuring the above even if the connector was already enabled before the
> > modeset.
> >
> > The issue led to the following:
> > [ 761.992923] i915 0000:00:02.0: drm_WARN_ON(payload->delete)
> > [ 761.992949] WARNING: CPU: 6 PID: 1401 at drivers/gpu/drm/display/drm_dp_mst_topology.c:4221 drm_dp_atomic_find_time_slots+0x236/0x280 [drm_display_helper]
> > [ 761.992955] Modules linked in: snd_hda_intel i915 drm_buddy drm_display_helper drm_kms_helper ttm drm snd_hda_codec_hdmi snd_intel_dspcfg snd_hda_codec snd_hwdep snd_hda_core snd_pcm prime_numbers i2c_algo_bit syscopyarea sysfillrect sysimgblt fb_sys_fops x86_pkg_temp_thermal cdc_ether coretemp crct10dif_pclmul usbnet crc32_pclmul mii ghash_clmulni_intel e1000e mei_me ptp i2c_i801 pps_core mei i2c_smbus intel_lpss_pci fuse [last unloaded: drm]
> > [ 761.992986] CPU: 6 PID: 1401 Comm: testdisplay Tainted: G U 6.0.0-rc4-imre+ #565
> > [ 761.992989] Hardware name: Intel Corporation Alder Lake Client Platform/AlderLake-P DDR5 RVP, BIOS ADLPFWI1.R00.3135.A00.2203251419 03/25/2022
> > [ 761.992990] RIP: 0010:drm_dp_atomic_find_time_slots+0x236/0x280 [drm_display_helper]
> > [ 761.992994] Code: 4c 8b 67 50 4d 85 e4 75 03 4c 8b 27 e8 03 28 4e e1 48 c7 c1 8b 26 2c a0 4c 89 e2 48 c7 c7 a8 26 2c a0 48 89 c6 e8 31 d5 88 e1 <0f> 0b 49 8b 85 d0 00 00 00 4c 89 fa 48 c7 c6 a0 41 2c a0 48 8b 78
> > [ 761.992995] RSP: 0018:ffffc9000177ba60 EFLAGS: 00010286
> > [ 761.992998] RAX: 0000000000000000 RBX: ffff88810d2f1540 RCX: 0000000000000000
> > [ 761.992999] RDX: 0000000000000001 RSI: ffffffff82368a25 RDI: 00000000ffffffff
> > [ 761.993000] RBP: ffff888142299d80 R08: ffff8884adbfdfe8 R09: 00000000ffefffff
> > [ 761.993001] R10: ffff8884a6bfe000 R11: ffff8884ac443c30 R12: ffff888102972f90
> > [ 761.993002] R13: ffff8881163e2cf0 R14: 00000000000003ac R15: ffff88810c501000
> > [ 761.993003] FS: 00007f81e4c459c0(0000) GS:ffff888496500000(0000) knlGS:0000000000000000
> > [ 761.993004] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> > [ 761.993005] CR2: 0000555dac962a98 CR3: 0000000123a34006 CR4: 0000000000770ee0
> > [ 761.993006] PKRU: 55555554
> > [ 761.993007] Call Trace:
> > [ 761.993009] <TASK>
> > [ 761.993012] intel_dp_mst_compute_config+0x19a/0x350 [i915]
> > [ 761.993090] intel_atomic_check+0xf37/0x3180 [i915]
> > [ 761.993168] drm_atomic_check_only+0x5d3/0xa60 [drm]
> > [ 761.993182] drm_atomic_commit+0x56/0xc0 [drm]
> > [ 761.993192] ? drm_plane_get_damage_clips.cold+0x1c/0x1c [drm]
> > [ 761.993204] drm_atomic_helper_set_config+0x78/0xc0 [drm_kms_helper]
> > [ 761.993214] drm_mode_setcrtc+0x1ed/0x750 [drm]
> > [ 761.993232] ? drm_mode_getcrtc+0x180/0x180 [drm]
> > [ 761.993241] drm_ioctl_kernel+0xb5/0x150 [drm]
> > [ 761.993252] drm_ioctl+0x203/0x3d0 [drm]
> > [ 761.993261] ? drm_mode_getcrtc+0x180/0x180 [drm]
> > [ 761.993276] __x64_sys_ioctl+0x8a/0xb0
> > [ 761.993281] do_syscall_64+0x38/0x90
> > [ 761.993285] entry_SYSCALL_64_after_hwframe+0x63/0xcd
> > [ 761.993287] RIP: 0033:0x7f81e551aaff
> > [ 761.993288] Code: 00 48 89 44 24 18 31 c0 48 8d 44 24 60 c7 04 24 10 00 00 00 48 89 44 24 08 48 8d 44 24 20 48 89 44 24 10 b8 10 00 00 00 0f 05 <41> 89 c0 3d 00 f0 ff ff 77 1f 48 8b 44 24 18 64 48 2b 04 25 28 00
> > [ 761.993290] RSP: 002b:00007fff4304af10 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
> > [ 761.993292] RAX: ffffffffffffffda RBX: 00007fff4304afa0 RCX: 00007f81e551aaff
> > [ 761.993293] RDX: 00007fff4304afa0 RSI: 00000000c06864a2 RDI: 0000000000000004
> > [ 761.993294] RBP: 00000000c06864a2 R08: 0000000000000000 R09: 0000555dac8a9c68
> > [ 761.993294] R10: 0000000000000000 R11: 0000000000000246 R12: 00000000000008c4
> > [ 761.993295] R13: 0000000000000004 R14: 0000555dac8a9c68 R15: 00007fff4304b098
> > [ 761.993301] </TASK>
> >
> > Fixes: 083351e96386 ("drm/display/dp_mst: Fix modeset tracking in drm_dp_atomic_release_vcpi_slots()")
> > Testcase: igt@testdisplay
> > Cc: Lyude Paul <lyude@redhat.com>
> > Signed-off-by: Imre Deak <imre.deak@intel.com>
> > ---
> > drivers/gpu/drm/display/drm_dp_mst_topology.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c
> > index 1de438151cc39..4442cc5602d45 100644
> > --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c
> > +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c
> > @@ -4322,6 +4322,9 @@ int drm_dp_atomic_release_time_slots(struct drm_atomic_state *state,
> > return -EINVAL;
> > }
> >
> > + if (new_conn_state->crtc)
> > + return 0;
> > +
> > drm_dbg_atomic(mgr->dev, "[MST PORT:%p] TU %d -> 0\n", port, payload->time_slots);
> > if (!payload->delete) {
> > drm_dp_mst_put_port_malloc(port);
>
> --
> Cheers,
> Lyude Paul (she/her)
> Software Engineer at Red Hat
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/dp_mst: Avoid deleting payloads for connectors staying enabled
@ 2022-09-08 9:11 ` Imre Deak
0 siblings, 0 replies; 8+ messages in thread
From: Imre Deak @ 2022-09-08 9:11 UTC (permalink / raw)
To: Lyude Paul; +Cc: intel-gfx, dri-devel
On Wed, Sep 07, 2022 at 02:23:51PM -0400, Lyude Paul wrote:
> Surprised this didn't come up on Intel's CI (or at least it certainly didn't
> when the series that introduced this was tested),
Yes, this was a problem in CI which didn't have any MST sinks. Now there
is and the problem is visible:
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12093/bat-rpls-2/igt@kms_flip@basic-flip-vs-dpms@b-dp5.html
> thanks for the catch!
>
> Reviewed-by: Lyude Paul <lyude@redhat.com>
Thanks.
> On Wed, 2022-09-07 at 17:25 +0300, Imre Deak wrote:
> > When an MST connector stays enabled during a commit the connector's MST
> > state needs to be added to the atomic state, but the corresponding MST
> > payload allocation shouldn't be set for deletion; fix such modesets by
> > ensuring the above even if the connector was already enabled before the
> > modeset.
> >
> > The issue led to the following:
> > [ 761.992923] i915 0000:00:02.0: drm_WARN_ON(payload->delete)
> > [ 761.992949] WARNING: CPU: 6 PID: 1401 at drivers/gpu/drm/display/drm_dp_mst_topology.c:4221 drm_dp_atomic_find_time_slots+0x236/0x280 [drm_display_helper]
> > [ 761.992955] Modules linked in: snd_hda_intel i915 drm_buddy drm_display_helper drm_kms_helper ttm drm snd_hda_codec_hdmi snd_intel_dspcfg snd_hda_codec snd_hwdep snd_hda_core snd_pcm prime_numbers i2c_algo_bit syscopyarea sysfillrect sysimgblt fb_sys_fops x86_pkg_temp_thermal cdc_ether coretemp crct10dif_pclmul usbnet crc32_pclmul mii ghash_clmulni_intel e1000e mei_me ptp i2c_i801 pps_core mei i2c_smbus intel_lpss_pci fuse [last unloaded: drm]
> > [ 761.992986] CPU: 6 PID: 1401 Comm: testdisplay Tainted: G U 6.0.0-rc4-imre+ #565
> > [ 761.992989] Hardware name: Intel Corporation Alder Lake Client Platform/AlderLake-P DDR5 RVP, BIOS ADLPFWI1.R00.3135.A00.2203251419 03/25/2022
> > [ 761.992990] RIP: 0010:drm_dp_atomic_find_time_slots+0x236/0x280 [drm_display_helper]
> > [ 761.992994] Code: 4c 8b 67 50 4d 85 e4 75 03 4c 8b 27 e8 03 28 4e e1 48 c7 c1 8b 26 2c a0 4c 89 e2 48 c7 c7 a8 26 2c a0 48 89 c6 e8 31 d5 88 e1 <0f> 0b 49 8b 85 d0 00 00 00 4c 89 fa 48 c7 c6 a0 41 2c a0 48 8b 78
> > [ 761.992995] RSP: 0018:ffffc9000177ba60 EFLAGS: 00010286
> > [ 761.992998] RAX: 0000000000000000 RBX: ffff88810d2f1540 RCX: 0000000000000000
> > [ 761.992999] RDX: 0000000000000001 RSI: ffffffff82368a25 RDI: 00000000ffffffff
> > [ 761.993000] RBP: ffff888142299d80 R08: ffff8884adbfdfe8 R09: 00000000ffefffff
> > [ 761.993001] R10: ffff8884a6bfe000 R11: ffff8884ac443c30 R12: ffff888102972f90
> > [ 761.993002] R13: ffff8881163e2cf0 R14: 00000000000003ac R15: ffff88810c501000
> > [ 761.993003] FS: 00007f81e4c459c0(0000) GS:ffff888496500000(0000) knlGS:0000000000000000
> > [ 761.993004] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> > [ 761.993005] CR2: 0000555dac962a98 CR3: 0000000123a34006 CR4: 0000000000770ee0
> > [ 761.993006] PKRU: 55555554
> > [ 761.993007] Call Trace:
> > [ 761.993009] <TASK>
> > [ 761.993012] intel_dp_mst_compute_config+0x19a/0x350 [i915]
> > [ 761.993090] intel_atomic_check+0xf37/0x3180 [i915]
> > [ 761.993168] drm_atomic_check_only+0x5d3/0xa60 [drm]
> > [ 761.993182] drm_atomic_commit+0x56/0xc0 [drm]
> > [ 761.993192] ? drm_plane_get_damage_clips.cold+0x1c/0x1c [drm]
> > [ 761.993204] drm_atomic_helper_set_config+0x78/0xc0 [drm_kms_helper]
> > [ 761.993214] drm_mode_setcrtc+0x1ed/0x750 [drm]
> > [ 761.993232] ? drm_mode_getcrtc+0x180/0x180 [drm]
> > [ 761.993241] drm_ioctl_kernel+0xb5/0x150 [drm]
> > [ 761.993252] drm_ioctl+0x203/0x3d0 [drm]
> > [ 761.993261] ? drm_mode_getcrtc+0x180/0x180 [drm]
> > [ 761.993276] __x64_sys_ioctl+0x8a/0xb0
> > [ 761.993281] do_syscall_64+0x38/0x90
> > [ 761.993285] entry_SYSCALL_64_after_hwframe+0x63/0xcd
> > [ 761.993287] RIP: 0033:0x7f81e551aaff
> > [ 761.993288] Code: 00 48 89 44 24 18 31 c0 48 8d 44 24 60 c7 04 24 10 00 00 00 48 89 44 24 08 48 8d 44 24 20 48 89 44 24 10 b8 10 00 00 00 0f 05 <41> 89 c0 3d 00 f0 ff ff 77 1f 48 8b 44 24 18 64 48 2b 04 25 28 00
> > [ 761.993290] RSP: 002b:00007fff4304af10 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
> > [ 761.993292] RAX: ffffffffffffffda RBX: 00007fff4304afa0 RCX: 00007f81e551aaff
> > [ 761.993293] RDX: 00007fff4304afa0 RSI: 00000000c06864a2 RDI: 0000000000000004
> > [ 761.993294] RBP: 00000000c06864a2 R08: 0000000000000000 R09: 0000555dac8a9c68
> > [ 761.993294] R10: 0000000000000000 R11: 0000000000000246 R12: 00000000000008c4
> > [ 761.993295] R13: 0000000000000004 R14: 0000555dac8a9c68 R15: 00007fff4304b098
> > [ 761.993301] </TASK>
> >
> > Fixes: 083351e96386 ("drm/display/dp_mst: Fix modeset tracking in drm_dp_atomic_release_vcpi_slots()")
> > Testcase: igt@testdisplay
> > Cc: Lyude Paul <lyude@redhat.com>
> > Signed-off-by: Imre Deak <imre.deak@intel.com>
> > ---
> > drivers/gpu/drm/display/drm_dp_mst_topology.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c
> > index 1de438151cc39..4442cc5602d45 100644
> > --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c
> > +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c
> > @@ -4322,6 +4322,9 @@ int drm_dp_atomic_release_time_slots(struct drm_atomic_state *state,
> > return -EINVAL;
> > }
> >
> > + if (new_conn_state->crtc)
> > + return 0;
> > +
> > drm_dbg_atomic(mgr->dev, "[MST PORT:%p] TU %d -> 0\n", port, payload->time_slots);
> > if (!payload->delete) {
> > drm_dp_mst_put_port_malloc(port);
>
> --
> Cheers,
> Lyude Paul (she/her)
> Software Engineer at Red Hat
>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-09-08 9:11 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-07 14:25 [PATCH] drm/dp_mst: Avoid deleting payloads for connectors staying enabled Imre Deak
2022-09-07 14:25 ` [Intel-gfx] " Imre Deak
2022-09-07 15:18 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2022-09-07 18:23 ` [PATCH] " Lyude Paul
2022-09-07 18:23 ` [Intel-gfx] " Lyude Paul
2022-09-08 9:11 ` Imre Deak
2022-09-08 9:11 ` [Intel-gfx] " Imre Deak
2022-09-07 21:44 ` [Intel-gfx] ✓ Fi.CI.IGT: success for " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.