drm/amd/dm/mst: Ignore payload update failures on disable
PATCH 1/1 drm/amd/dm/mst: Ignore payload update failures on disable
Disabling a display on MST can potentially happen after the entire MST topology has been removed, which means that we can't communicate with the topology at all in this scenario. Likewise, this also means that we can't properly update payloads on the topology and as such, it's a good idea to ignore payload update failures when disabling displays. Currently, amdgpu makes the mistake of halting the payload update process when any payload update failures occur, resulting in leaving DC's local copies of the payload tables out of date.
This ends up causing problems with hotplugging MST topologies, and causes modesets on the second hotplug to fail like so:
[drm] Failed to updateMST allocation table forpipe idx:1
------------[ cut here ]------------ WARNING: CPU: 5 PID: 1511 at drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link.c:2677 update_mst_stream_alloc_table+0x11e/0x130 [amdgpu] Modules linked in: cdc_ether usbnet fuse xt_conntrack nf_conntrack
nf_defrag_ipv6 libcrc32c nf_defrag_ipv4 ipt_REJECT nf_reject_ipv4 nft_counter nft_compat nf_tables nfnetlink tun bridge stp llc sunrpc vfat fat wmi_bmof uvcvideo snd_hda_codec_realtek snd_hda_codec_generic snd_hda_codec_hdmi videobuf2_vmalloc snd_hda_intel videobuf2_memops videobuf2_v4l2 snd_intel_dspcfg videobuf2_common crct10dif_pclmul snd_hda_codec videodev crc32_pclmul snd_hwdep snd_hda_core ghash_clmulni_intel snd_seq mc joydev pcspkr snd_seq_device snd_pcm sp5100_tco k10temp i2c_piix4 snd_timer thinkpad_acpi ledtrig_audio snd wmi soundcore video i2c_scmi acpi_cpufreq ip_tables amdgpu(O) rtsx_pci_sdmmc amd_iommu_v2 gpu_sched mmc_core i2c_algo_bit ttm drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops cec drm crc32c_intel serio_raw hid_multitouch r8152 mii nvme r8169 nvme_core rtsx_pci pinctrl_amd
CPU: 5 PID: 1511 Comm: gnome-shell Tainted: G O 5.5.0-rc7Lyude-Test+ #4 Hardware name: LENOVO FA495SIT26/FA495SIT26, BIOS R12ET22W(0.22 ) 01/31/2019 RIP: 0010:update_mst_stream_alloc_table+0x11e/0x130 [amdgpu] Code: 28 00 00 00 75 2b 48 8d 65 e0 5b 41 5c 41 5d 41 5e 5d c3 0f b6 06 49 89 1c 24 41 88 44 24 08 0f b6 46 01 41 88 44 24 09 eb 93 <0f> 0b e9 2f ff ff ff e8 a6 82 a3 c2 66 0f 1f 44 00 00 0f 1f 44 00 RSP: 0018:ffffac428127f5b0 EFLAGS: 00010202 RAX: 0000000000000002 RBX: ffff8d1e166eee80 RCX: 0000000000000000 RDX: ffffac428127f668 RSI: ffff8d1e166eee80 RDI: ffffac428127f610 RBP: ffffac428127f640 R08: ffffffffc03d94a8 R09: 0000000000000000 R10: ffff8d1e24b02000 R11: ffffac428127f5b0 R12: ffff8d1e1b83d000 R13: ffff8d1e1bea0b08 R14: 0000000000000002 R15: 0000000000000002 FS: 00007fab23ffcd80(0000) GS:ffff8d1e28b40000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f151f1711e8 CR3: 00000005997c0000 CR4: 00000000003406e0 Call Trace: ? mutex_lock+0xe/0x30 dc_link_allocate_mst_payload+0x9a/0x210 [amdgpu] ? dm_read_reg_func+0x39/0xb0 [amdgpu] ? core_link_enable_stream+0x656/0x730 [amdgpu] core_link_enable_stream+0x656/0x730 [amdgpu] dce110_apply_ctx_to_hw+0x58e/0x5d0 [amdgpu] ? dcn10_verify_allow_pstate_change_high+0x1d/0x280 [amdgpu] ? dcn10_wait_for_mpcc_disconnect+0x3c/0x130 [amdgpu] dc_commit_state+0x292/0x770 [amdgpu] ? add_timer+0x101/0x1f0 ? ttm_bo_put+0x1a1/0x2f0 [ttm] amdgpu_dm_atomic_commit_tail+0xb59/0x1ff0 [amdgpu] ? amdgpu_move_blit.constprop.0+0xb8/0x1f0 [amdgpu] ? amdgpu_bo_move+0x16d/0x2b0 [amdgpu] ? ttm_bo_handle_move_mem+0x118/0x570 [ttm] ? ttm_bo_validate+0x134/0x150 [ttm] ? dm_plane_helper_prepare_fb+0x1b9/0x2a0 [amdgpu] ? _cond_resched+0x15/0x30 ? wait_for_completion_timeout+0x38/0x160 ? _cond_resched+0x15/0x30 ? wait_for_completion_interruptible+0x33/0x190 commit_tail+0x94/0x130 [drm_kms_helper] drm_atomic_helper_commit+0x113/0x140 [drm_kms_helper] drm_atomic_helper_set_config+0x70/0xb0 [drm_kms_helper] drm_mode_setcrtc+0x194/0x6a0 [drm] ? _cond_resched+0x15/0x30 ? mutex_lock+0xe/0x30 ? drm_mode_getcrtc+0x180/0x180 [drm] drm_ioctl_kernel+0xaa/0xf0 [drm] drm_ioctl+0x208/0x390 [drm] ? drm_mode_getcrtc+0x180/0x180 [drm] amdgpu_drm_ioctl+0x49/0x80 [amdgpu] do_vfs_ioctl+0x458/0x6d0 ksys_ioctl+0x5e/0x90 __x64_sys_ioctl+0x16/0x20 do_syscall_64+0x55/0x1b0 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7fab2121f87b Code: 0f 1e fa 48 8b 05 0d 96 2c 00 64 c7 00 26 00 00 00 48 c7 c0 ff ff
ff ff c3 66 0f 1f 44 00 00 f3 0f 1e fa b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d dd 95 2c 00 f7 d8 64 89 01 48
RSP: 002b:00007ffd045f9068 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX: 00007ffd045f90a0 RCX: 00007fab2121f87b
RDX: 00007ffd045f90a0 RSI: 00000000c06864a2 RDI: 000000000000000b
RBP: 00007ffd045f90a0 R08: 0000000000000000 R09: 000055dbd2985d10
R10: 000055dbd2196280 R11: 0000000000000246 R12: 00000000c06864a2
R13: 000000000000000b R14: 0000000000000000 R15: 000055dbd2196280
---[ end trace 6ea888c24d2059cd ]---
Note as well, I have only been able to reproduce this on setups with 2 MST displays.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +4 -3
@@ -216,6 +216,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(drm_dp_mst_reset_vcpi_slots (mst_mgr, mst_port); } +/* If disabling, it's OK for this to fail */ ret =drm_dp_update_payload_part1 (mst_mgr);/* mst_mgr->->payloads are VC payload notify MST branch using DPCD or
@@ -225,7 +226,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(get_payload_table (aconnector, proposed_table); -if (ret) +if (ret && !enable)return false;return true;
@@ -299,9 +300,9 @@ bool dm_helpers_dp_mst_send_payload_allocation(if (!mst_mgr->mst_state)return false; +/* If disabling, it's OK for this to fail */ ret =drm_dp_update_payload_part2 (mst_mgr); - -if (ret) +if (enable && ret)return false;if (!enable)
Signature · 1 line
2.24.1
Quoted 94 lines · Lyude Paul
Disabling a display on MST can potentially happen after the entire MST topology has been removed, which means that we can't communicate with the topology at all in this scenario. Likewise, this also means that we can't properly update payloads on the topology and as such, it's a good idea to ignore payload update failures when disabling displays. Currently, amdgpu makes the mistake of halting the payload update process when any payload update failures occur, resulting in leaving DC's local copies of the payload tables out of date.
This ends up causing problems with hotplugging MST topologies, and causes modesets on the second hotplug to fail like so:
[drm] Failed to updateMST allocation table forpipe idx:1
------------[ cut here ]------------ WARNING: CPU: 5 PID: 1511 at drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link.c:2677 update_mst_stream_alloc_table+0x11e/0x130 [amdgpu] Modules linked in: cdc_ether usbnet fuse xt_conntrack nf_conntrack
nf_defrag_ipv6libcrc32cnf_defrag_ipv4ipt_REJECTnf_reject_ipv4nft_counternft_compatnf_tablesnfnetlink tun bridge stp llc sunrpc vfat fatwmi_bmofuvcvideosnd_hda_codec_realteksnd_hda_codec_genericsnd_hda_codec_hdmivideobuf2_vmallocsnd_hda_intelvideobuf2_memopsvideobuf2_v4l2snd_intel_dspcfgvideobuf2_commoncrct10dif_pclmulsnd_hda_codecvideodevcrc32_pclmulsnd_hwdepsnd_hda_coreghash_clmulni_intelsnd_seqmc joydev pcspkrsnd_seq_devicesnd_pcmsp5100_tcok10tempi2c_piix4snd_timerthinkpad_acpiledtrig_audiosnd wmi soundcore videoi2c_scmiacpi_cpufreqip_tablesamdgpu(O)rtsx_pci_sdmmcamd_iommu_v2gpu_schedmmc_corei2c_algo_bitttmdrm_kms_helpersyscopyarea sysfillrect sysimgbltfb_sys_fopscec drmcrc32c_intelserio_rawhid_multitouchr8152 mii nvme r8169nvme_corertsx_pcipinctrl_amdCPU: 5 PID: 1511 Comm: gnome-shell Tainted: G O 5.5.0-rc7Lyude-Test+ #4 Hardware name: LENOVO FA495SIT26/FA495SIT26, BIOS R12ET22W(0.22 ) 01/31/2019 RIP: 0010:update_mst_stream_alloc_table+0x11e/0x130 [amdgpu] Code: 28 00 00 00 75 2b 48 8d 65 e0 5b 41 5c 41 5d 41 5e 5d c3 0f b6 06 49 89 1c 24 41 88 44 24 08 0f b6 46 01 41 88 44 24 09 eb 93 <0f> 0b e9 2f ff ff ff e8 a6 82 a3 c2 66 0f 1f 44 00 00 0f 1f 44 00 RSP: 0018:ffffac428127f5b0 EFLAGS: 00010202 RAX: 0000000000000002 RBX: ffff8d1e166eee80 RCX: 0000000000000000 RDX: ffffac428127f668 RSI: ffff8d1e166eee80 RDI: ffffac428127f610 RBP: ffffac428127f640 R08: ffffffffc03d94a8 R09: 0000000000000000 R10: ffff8d1e24b02000 R11: ffffac428127f5b0 R12: ffff8d1e1b83d000 R13: ffff8d1e1bea0b08 R14: 0000000000000002 R15: 0000000000000002 FS: 00007fab23ffcd80(0000) GS:ffff8d1e28b40000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f151f1711e8 CR3: 00000005997c0000 CR4: 00000000003406e0 Call Trace: ? mutex_lock+0xe/0x30 dc_link_allocate_mst_payload+0x9a/0x210 [amdgpu] ? dm_read_reg_func+0x39/0xb0 [amdgpu] ? core_link_enable_stream+0x656/0x730 [amdgpu] core_link_enable_stream+0x656/0x730 [amdgpu] dce110_apply_ctx_to_hw+0x58e/0x5d0 [amdgpu] ? dcn10_verify_allow_pstate_change_high+0x1d/0x280 [amdgpu] ? dcn10_wait_for_mpcc_disconnect+0x3c/0x130 [amdgpu] dc_commit_state+0x292/0x770 [amdgpu] ? add_timer+0x101/0x1f0 ? ttm_bo_put+0x1a1/0x2f0 [ttm] amdgpu_dm_atomic_commit_tail+0xb59/0x1ff0 [amdgpu] ? amdgpu_move_blit.constprop.0+0xb8/0x1f0 [amdgpu] ? amdgpu_bo_move+0x16d/0x2b0 [amdgpu] ? ttm_bo_handle_move_mem+0x118/0x570 [ttm] ? ttm_bo_validate+0x134/0x150 [ttm] ? dm_plane_helper_prepare_fb+0x1b9/0x2a0 [amdgpu] ? _cond_resched+0x15/0x30 ? wait_for_completion_timeout+0x38/0x160 ? _cond_resched+0x15/0x30 ? wait_for_completion_interruptible+0x33/0x190 commit_tail+0x94/0x130 [drm_kms_helper] drm_atomic_helper_commit+0x113/0x140 [drm_kms_helper] drm_atomic_helper_set_config+0x70/0xb0 [drm_kms_helper] drm_mode_setcrtc+0x194/0x6a0 [drm] ? _cond_resched+0x15/0x30 ? mutex_lock+0xe/0x30 ? drm_mode_getcrtc+0x180/0x180 [drm] drm_ioctl_kernel+0xaa/0xf0 [drm] drm_ioctl+0x208/0x390 [drm] ? drm_mode_getcrtc+0x180/0x180 [drm] amdgpu_drm_ioctl+0x49/0x80 [amdgpu] do_vfs_ioctl+0x458/0x6d0 ksys_ioctl+0x5e/0x90 __x64_sys_ioctl+0x16/0x20 do_syscall_64+0x55/0x1b0 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7fab2121f87b Code: 0f 1e fa 48 8b 05 0d 96 2c 00 64 c7 00 26 00 00 00 48 c7 c0 ff ffff ff c3 66 0f 1f 44 00 00 f3 0f 1e fa b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d dd 95 2c 00 f7 d8 64 89 01 48
RSP: 002b:00007ffd045f9068 EFLAGS: 00000246ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX:00007ffd045f90a0RCX:00007fab2121f87b
RDX:00007ffd045f90a0RSI:00000000c06864a2RDI:000000000000000b
RBP:00007ffd045f90a0R08: 0000000000000000 R09:000055dbd2985d10
R10:000055dbd2196280R11: 0000000000000246 R12:00000000c06864a2
R13:000000000000000bR14: 0000000000000000 R15:000055dbd2196280
Quoted 7 lines
---[ end trace 6ea888c24d2059cd ]---Note as well, I have only been able to reproduce this on setups with 2 MST displays.
Signed-off-by Lyude Paul <[email protected]>
LGTM but would like Mikita or Wayne to have a look as well.
Harry
Quoted 28 lines
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +2
-1@@ -216,6 +216,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(drm_dp_mst_reset_vcpi_slots (mst_mgr, mst_port); } +/* If disabling, it's OK for this to fail */ ret =drm_dp_update_payload_part1 (mst_mgr);/* mst_mgr->->payloads are VC payload notify MST branch using DPCD or @@ -225,7 +226,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(get_payload_table (aconnector, proposed_table); -if (ret) +if (ret && !enable)return false;return true;@@ -299,9 +300,9 @@ bool dm_helpers_dp_mst_send_payload_allocation(if (!mst_mgr->mst_state)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_send_payload_allocation( · line 308
Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +2
-2return false; +/* If disabling, it's OK for this to fail */ ret =drm_dp_update_payload_part2 (mst_mgr); - -if (ret) +if (enable && ret)return false;if (!enable)
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 97 lines · Harry Wentland
Quoted 96 lines · Lyude Paul
Disabling a display on MST can potentially happen after the entire MST topology has been removed, which means that we can't communicate with the topology at all in this scenario. Likewise, this also means that we can't properly update payloads on the topology and as such, it's a good idea to ignore payload update failures when disabling displays. Currently, amdgpu makes the mistake of halting the payload update process when any payload update failures occur, resulting in leaving DC's local copies of the payload tables out of date.
This ends up causing problems with hotplugging MST topologies, and causes modesets on the second hotplug to fail like so:
[drm] Failed to updateMST allocation table forpipe idx:1
------------[ cut here ]------------ WARNING: CPU: 5 PID: 1511 at drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link.c:2677 update_mst_stream_alloc_table+0x11e/0x130 [amdgpu] Modules linked in: cdc_ether usbnet fuse xt_conntrack nf_conntrack
nf_defrag_ipv6libcrc32cnf_defrag_ipv4ipt_REJECTnf_reject_ipv4nft_counternft_compatnf_tablesnfnetlink tun bridge stp llc sunrpc vfat fatwmi_bmofuvcvideosnd_hda_codec_realteksnd_hda_codec_genericsnd_hda_codec_hdmivideobuf2_vmallocsnd_hda_intelvideobuf2_memopsvideobuf2_v4l2snd_intel_dspcfgvideobuf2_commoncrct10dif_pclmulsnd_hda_codecvideodevcrc32_pclmulsnd_hwdepsnd_hda_coreghash_clmulni_intelsnd_seqmc joydev pcspkrsnd_seq_devicesnd_pcmsp5100_tcok10tempi2c_piix4snd_timerthinkpad_acpiledtrig_audiosnd wmi soundcore videoi2c_scmiacpi_cpufreqip_tablesamdgpu(O)rtsx_pci_sdmmcamd_iommu_v2gpu_schedmmc_corei2c_algo_bitttmdrm_kms_helpersyscopyarea sysfillrect sysimgbltfb_sys_fopscec drmcrc32c_intelserio_rawhid_multitouchr8152 mii nvme r8169nvme_corertsx_pcipinctrl_amdCPU: 5 PID: 1511 Comm: gnome-shell Tainted: G O 5.5.0-rc7Lyude-Test+ #4 Hardware name: LENOVO FA495SIT26/FA495SIT26, BIOS R12ET22W(0.22 ) 01/31/2019 RIP: 0010:update_mst_stream_alloc_table+0x11e/0x130 [amdgpu] Code: 28 00 00 00 75 2b 48 8d 65 e0 5b 41 5c 41 5d 41 5e 5d c3 0f b6 06 49 89 1c 24 41 88 44 24 08 0f b6 46 01 41 88 44 24 09 eb 93 <0f> 0b e9 2f ff ff ff e8 a6 82 a3 c2 66 0f 1f 44 00 00 0f 1f 44 00 RSP: 0018:ffffac428127f5b0 EFLAGS: 00010202 RAX: 0000000000000002 RBX: ffff8d1e166eee80 RCX: 0000000000000000 RDX: ffffac428127f668 RSI: ffff8d1e166eee80 RDI: ffffac428127f610 RBP: ffffac428127f640 R08: ffffffffc03d94a8 R09: 0000000000000000 R10: ffff8d1e24b02000 R11: ffffac428127f5b0 R12: ffff8d1e1b83d000 R13: ffff8d1e1bea0b08 R14: 0000000000000002 R15: 0000000000000002 FS: 00007fab23ffcd80(0000) GS:ffff8d1e28b40000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f151f1711e8 CR3: 00000005997c0000 CR4: 00000000003406e0 Call Trace: ? mutex_lock+0xe/0x30 dc_link_allocate_mst_payload+0x9a/0x210 [amdgpu] ? dm_read_reg_func+0x39/0xb0 [amdgpu] ? core_link_enable_stream+0x656/0x730 [amdgpu] core_link_enable_stream+0x656/0x730 [amdgpu] dce110_apply_ctx_to_hw+0x58e/0x5d0 [amdgpu] ? dcn10_verify_allow_pstate_change_high+0x1d/0x280 [amdgpu] ? dcn10_wait_for_mpcc_disconnect+0x3c/0x130 [amdgpu] dc_commit_state+0x292/0x770 [amdgpu] ? add_timer+0x101/0x1f0 ? ttm_bo_put+0x1a1/0x2f0 [ttm] amdgpu_dm_atomic_commit_tail+0xb59/0x1ff0 [amdgpu] ? amdgpu_move_blit.constprop.0+0xb8/0x1f0 [amdgpu] ? amdgpu_bo_move+0x16d/0x2b0 [amdgpu] ? ttm_bo_handle_move_mem+0x118/0x570 [ttm] ? ttm_bo_validate+0x134/0x150 [ttm] ? dm_plane_helper_prepare_fb+0x1b9/0x2a0 [amdgpu] ? _cond_resched+0x15/0x30 ? wait_for_completion_timeout+0x38/0x160 ? _cond_resched+0x15/0x30 ? wait_for_completion_interruptible+0x33/0x190 commit_tail+0x94/0x130 [drm_kms_helper] drm_atomic_helper_commit+0x113/0x140 [drm_kms_helper] drm_atomic_helper_set_config+0x70/0xb0 [drm_kms_helper] drm_mode_setcrtc+0x194/0x6a0 [drm] ? _cond_resched+0x15/0x30 ? mutex_lock+0xe/0x30 ? drm_mode_getcrtc+0x180/0x180 [drm] drm_ioctl_kernel+0xaa/0xf0 [drm] drm_ioctl+0x208/0x390 [drm] ? drm_mode_getcrtc+0x180/0x180 [drm] amdgpu_drm_ioctl+0x49/0x80 [amdgpu] do_vfs_ioctl+0x458/0x6d0 ksys_ioctl+0x5e/0x90 __x64_sys_ioctl+0x16/0x20 do_syscall_64+0x55/0x1b0 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7fab2121f87b Code: 0f 1e fa 48 8b 05 0d 96 2c 00 64 c7 00 26 00 00 00 48 c7 c0 ff ffff ff c3 66 0f 1f 44 00 00 f3 0f 1e fa b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d dd 95 2c 00 f7 d8 64 89 01 48
RSP: 002b:00007ffd045f9068 EFLAGS: 00000246ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX:00007ffd045f90a0RCX:00007fab2121f87b
RDX:00007ffd045f90a0RSI:00000000c06864a2RDI:000000000000000b
RBP:00007ffd045f90a0R08: 0000000000000000 R09:000055dbd2985d10
R10:000055dbd2196280R11: 0000000000000246 R12:00000000c06864a2
R13:000000000000000bR14: 0000000000000000 R15:000055dbd2196280---[ end trace 6ea888c24d2059cd ]---
Quoted 8 lines
Quoted 5 lines
Note as well, I have only been able to reproduce this on setups with 2 MST displays.
Signed-off-by Lyude Paul <[email protected]>LGTM but would like Mikita or Wayne to have a look as well.
Acked-by Harry Wentland <[email protected]>
I think its a good change and it definetely helps to deal with discreptency between drm and dc payload allocation tables. But I think we might not even need extra enable checks.
Quoted 18 lines
Harry
Quoted 15 lines
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1
-0@@ -216,6 +216,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(drm_dp_mst_reset_vcpi_slots (mst_mgr, mst_port); } +/* If disabling, it's OK for this to fail */ ret =drm_dp_update_payload_part1 (mst_mgr);
Quoted 8 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_write_payload_allocation_table( · line 230
Quoted 8 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1
-1/* mst_mgr->->payloads are VC payload notify MST branch using DPCD or @@ -225,7 +226,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(get_payload_table (aconnector, proposed_table); -if (ret) +if (ret && !enable)return false;
Wouldn't it be better to check ret value, and instead of returning false just throw DRM_ERROR message, since drm_dp_update_payload_part1 only returns error if a port is not validated?
Thank you,
Mikita
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0
-0return true;@@ -299,9 +300,9 @@ bool dm_helpers_dp_mst_send_payload_allocation(if (!mst_mgr->mst_state)return false;
Quoted 8 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_send_payload_allocation( · line 308
Quoted 8 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +2
-2+/* If disabling, it's OK for this to fail */ ret =drm_dp_update_payload_part2 (mst_mgr); - -if (ret) +if (enable && ret)return false;if (!enable)
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 108 lines · Mikita Lipski
Quoted 106 lines · Harry Wentland
Quoted 104 lines · Lyude Paul
Disabling a display on MST can potentially happen after the entire MST topology has been removed, which means that we can't communicate with the topology at all in this scenario. Likewise, this also means that we can't properly update payloads on the topology and as such, it's a good idea to ignore payload update failures when disabling displays. Currently, amdgpu makes the mistake of halting the payload update process when any payload update failures occur, resulting in leaving DC's local copies of the payload tables out of date.
This ends up causing problems with hotplugging MST topologies, and causes modesets on the second hotplug to fail like so:
[drm] Failed to updateMST allocation table forpipe idx:1
------------[ cut here ]------------ WARNING: CPU: 5 PID: 1511 at drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link.c:2677 update_mst_stream_alloc_table+0x11e/0x130 [amdgpu] Modules linked in: cdc_ether usbnet fuse xt_conntrack nf_conntrack
nf_defrag_ipv6libcrc32cnf_defrag_ipv4ipt_REJECTnf_reject_ipv4nft_counternft_compatnf_tablesnfnetlink tun bridge stp llc sunrpc vfat fatwmi_bmofuvcvideosnd_hda_codec_realteksnd_hda_codec_genericsnd_hda_codec_hdmivideobuf2_vmallocsnd_hda_intelvideobuf2_memopsvideobuf2_v4l2snd_intel_dspcfgvideobuf2_commoncrct10dif_pclmulsnd_hda_codecvideodevcrc32_pclmulsnd_hwdepsnd_hda_coreghash_clmulni_intelsnd_seqmc joydev pcspkrsnd_seq_devicesnd_pcmsp5100_tcok10tempi2c_piix4snd_timerthinkpad_acpiledtrig_audiosnd wmi soundcore videoi2c_scmiacpi_cpufreqip_tablesamdgpu(O)rtsx_pci_sdmmcamd_iommu_v2gpu_schedmmc_corei2c_algo_bitttmdrm_kms_helpersyscopyarea sysfillrect sysimgbltfb_sys_fopscec drmcrc32c_intelserio_rawhid_multitouchr8152 mii nvme r8169nvme_corertsx_pcipinctrl_amdCPU: 5 PID: 1511 Comm: gnome-shell Tainted: G O 5.5.0- rc7Lyude-Test+ #4 Hardware name: LENOVO FA495SIT26/FA495SIT26, BIOS R12ET22W(0.22 ) 01/31/2019 RIP: 0010:update_mst_stream_alloc_table+0x11e/0x130 [amdgpu] Code: 28 00 00 00 75 2b 48 8d 65 e0 5b 41 5c 41 5d 41 5e 5d c3 0f b6 06 49 89 1c 24 41 88 44 24 08 0f b6 46 01 41 88 44 24 09 eb 93 <0f> 0b e9 2f ff ff ff e8 a6 82 a3 c2 66 0f 1f 44 00 00 0f 1f 44 00 RSP: 0018:ffffac428127f5b0 EFLAGS: 00010202 RAX: 0000000000000002 RBX: ffff8d1e166eee80 RCX: 0000000000000000 RDX: ffffac428127f668 RSI: ffff8d1e166eee80 RDI: ffffac428127f610 RBP: ffffac428127f640 R08: ffffffffc03d94a8 R09: 0000000000000000 R10: ffff8d1e24b02000 R11: ffffac428127f5b0 R12: ffff8d1e1b83d000 R13: ffff8d1e1bea0b08 R14: 0000000000000002 R15: 0000000000000002 FS: 00007fab23ffcd80(0000) GS:ffff8d1e28b40000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f151f1711e8 CR3: 00000005997c0000 CR4: 00000000003406e0 Call Trace: ? mutex_lock+0xe/0x30 dc_link_allocate_mst_payload+0x9a/0x210 [amdgpu] ? dm_read_reg_func+0x39/0xb0 [amdgpu] ? core_link_enable_stream+0x656/0x730 [amdgpu] core_link_enable_stream+0x656/0x730 [amdgpu] dce110_apply_ctx_to_hw+0x58e/0x5d0 [amdgpu] ? dcn10_verify_allow_pstate_change_high+0x1d/0x280 [amdgpu] ? dcn10_wait_for_mpcc_disconnect+0x3c/0x130 [amdgpu] dc_commit_state+0x292/0x770 [amdgpu] ? add_timer+0x101/0x1f0 ? ttm_bo_put+0x1a1/0x2f0 [ttm] amdgpu_dm_atomic_commit_tail+0xb59/0x1ff0 [amdgpu] ? amdgpu_move_blit.constprop.0+0xb8/0x1f0 [amdgpu] ? amdgpu_bo_move+0x16d/0x2b0 [amdgpu] ? ttm_bo_handle_move_mem+0x118/0x570 [ttm] ? ttm_bo_validate+0x134/0x150 [ttm] ? dm_plane_helper_prepare_fb+0x1b9/0x2a0 [amdgpu] ? _cond_resched+0x15/0x30 ? wait_for_completion_timeout+0x38/0x160 ? _cond_resched+0x15/0x30 ? wait_for_completion_interruptible+0x33/0x190 commit_tail+0x94/0x130 [drm_kms_helper] drm_atomic_helper_commit+0x113/0x140 [drm_kms_helper] drm_atomic_helper_set_config+0x70/0xb0 [drm_kms_helper] drm_mode_setcrtc+0x194/0x6a0 [drm] ? _cond_resched+0x15/0x30 ? mutex_lock+0xe/0x30 ? drm_mode_getcrtc+0x180/0x180 [drm] drm_ioctl_kernel+0xaa/0xf0 [drm] drm_ioctl+0x208/0x390 [drm] ? drm_mode_getcrtc+0x180/0x180 [drm] amdgpu_drm_ioctl+0x49/0x80 [amdgpu] do_vfs_ioctl+0x458/0x6d0 ksys_ioctl+0x5e/0x90 __x64_sys_ioctl+0x16/0x20 do_syscall_64+0x55/0x1b0 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7fab2121f87b Code: 0f 1e fa 48 8b 05 0d 96 2c 00 64 c7 00 26 00 00 00 48 c7 c0 ff ffff ff c3 66 0f 1f 44 00 00 f3 0f 1e fa b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d dd 95 2c 00 f7 d8 64 89 01 48
RSP: 002b:00007ffd045f9068 EFLAGS: 00000246ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX:00007ffd045f90a0RCX:00007fab2121f87b
RDX:00007ffd045f90a0RSI:00000000c06864a2RDI:000000000000000b
RBP:00007ffd045f90a0R08: 0000000000000000 R09:000055dbd2985d10
R10:000055dbd2196280R11: 0000000000000246 R12:00000000c06864a2
R13:000000000000000bR14: 0000000000000000 R15:000055dbd2196280---[ end trace 6ea888c24d2059cd ]---Note as well, I have only been able to reproduce this on setups with 2 MST displays.
Signed-off-by Lyude Paul <[email protected]>
Quoted 6 lines
Quoted 2 lines
LGTM but would like Mikita or Wayne to have a look as well.
Acked-by Harry Wentland <[email protected]>I think its a good change and it definetely helps to deal with discreptency between drm and dc payload allocation tables. But I think we might not even need extra enable checks.
I think you're right here, I'll remove those in the next respin
Quoted 27 lines
Quoted 27 lines
Harry
Quoted 24 lines
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0
-0@@ -216,6 +216,7 @@ booldm_helpers_dp_mst_write_payload_allocation_table(
drm_dp_mst_reset_vcpi_slots(mst_mgr, mst_port);
}drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1
-0+/* If disabling, it's OK for this to fail */ ret =drm_dp_update_payload_part1 (mst_mgr);/* mst_mgr->->payloads are VC payload notify MST branch using DPCD or
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0
-0@@ -225,7 +226,7 @@ booldm_helpers_dp_mst_write_payload_allocation_table(
get_payload_table(aconnector, proposed_table);
Quoted 7 lines
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_write_payload_allocation_table( · line 230
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1
-1-if (ret) +if (ret && !enable)return false;Wouldn't it be better to check ret value, and instead of returning false just throw
DRM_ERRORmessage, sincedrm_dp_update_payload_part1only returns error if a port is not validated?
You're right on avoiding returning here, that's probably a better idea since we want all steps to be run even if they don't succeed. I think we can skip the error message though, it's expected that modesets which disable displays will happen on ports that no longer can be validated.
Quoted 18 lines
Thank you,
MikitaQuoted 14 lines
Quoted 14 lines
return true;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +2
-2@@ -299,9 +300,9 @@ bool dm_helpers_dp_mst_send_payload_allocation(if (!mst_mgr->mst_state)return false; +/* If disabling, it's OK for this to fail */ ret =drm_dp_update_payload_part2 (mst_mgr); - -if (ret) +if (enable && ret)return false;if (!enable)
Signature · 2 lines
Cheers, Lyude Paul
[AMD Public Use]
Hi Lyude,
Thanks for the patch!
I'm wondering if this error still occurs with this patch applied
https://patchwork.kernel.org/patch/11274363/
I tried to clean up all mgr->proposed_vcpis[] in this patch so drm_dp_update_payload_part1() will skip all invalid ports.
However, I'm also thinking to improve this patch.
Maybe it is better to do cleaning proposed_vcpis[] in dm_helpers_dp_mst_write_payload_allocation_table() due to it is the actual place that DC try to update the status for a specific VC stream. If it's reasonable then I'll do that in the future :)
Quoted 213 lines
-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: Saturday, January 25, 2020 2:57 AM
To: Lipski, Mikita <[email protected]>; Wentland, Harry <[email protected]>; [email protected]
Cc: [email protected]; Wentland, Harry <[email protected]>; Li, Sun peng (Leo) <[email protected]>; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Zhou, David(ChunMing) <[email protected]>; David Airlie <[email protected]>; Daniel Vetter <[email protected]>; Lakha, Bhawanpreet <[email protected]>; Lipski, Mikita <[email protected]>; Sam Ravnborg <[email protected]>; David Francis <[email protected]>; Tsai, Martin <[email protected]>; Chris Wilson <[email protected]>; Lee, Alvin <[email protected]>; Jean Delvare <[email protected]>; [email protected]; [email protected]; Lin, Wayne <[email protected]>
Subject: Re: [PATCH] drm/amd/dm/mst: Ignore payload update failures on disableQuoted 8 lines · Mikita Lipski
Quoted 6 lines · Harry Wentland
Quoted 5 lines · Lyude Paul
Disabling a display on MST can potentially happen after the entire MST topology has been removed, which means that we can't communicate with the topology at all in this scenario. Likewise, this also means that we can't properly update payloads on the topology and as such, it's a good idea to ignore payload update failures
when disabling displays.
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Currently, amdgpu makes the mistake of halting the payload update process when any payload update failures occur, resulting in leaving DC's local copies of the payload tables out of date.
This ends up causing problems with hotplugging MST topologies, and causes modesets on the second hotplug to fail like so:
[drm] Failed to updateMST allocation table forpipe idx:1
------------[ cut here ]------------ WARNING: CPU: 5 PID: 1511 at
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link.c:2677update_mst_stream_alloc_table+0x11e/0x130[amdgpu] Modules linked
in:cdc_etherusbnet fusext_conntracknf_conntracknf_defrag_ipv6libcrc32cnf_defrag_ipv4ipt_REJECTnf_reject_ipv4nft_counternft_compatnf_tablesnfnetlink tun bridge stp llc sunrpc vfat fatwmi_bmofuvcvideosnd_hda_codec_realtekQuoted 8 lines
Quoted 8 lines
Quoted 8 lines
snd_hda_codec_genericsnd_hda_codec_hdmivideobuf2_vmallocsnd_hda_intelvideobuf2_memopsvideobuf2_v4l2snd_intel_dspcfgvideobuf2_commoncrct10dif_pclmulsnd_hda_codecvideodevcrc32_pclmulsnd_hwdepsnd_hda_coreghash_clmulni_intelsnd_seqmc joydev pcspkrsnd_seq_devicesnd_pcmsp5100_tcok10tempi2c_piix4snd_timerthinkpad_acpiledtrig_audiosnd wmi soundcore videoi2c_scmiacpi_cpufreqip_tablesamdgpu(O)rtsx_pci_sdmmcamd_iommu_v2gpu_sched
mmc_coreQuoted 4 lines
Quoted 4 lines
Quoted 4 lines
i2c_algo_bitttmdrm_kms_helpersyscopyarea sysfillrect sysimgbltfb_sys_fopscec drmcrc32c_intelserio_rawhid_multitouchr8152 mii nvme r8169nvme_corertsx_pcipinctrl_amdCPU: 5 PID: 1511 Comm: gnome-shell Tainted: G O5.5.0-
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
rc7Lyude-Test+ #4
Hardware name: LENOVO FA495SIT26/FA495SIT26, BIOSR12ET22W(0.22 )
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
01/31/2019
RIP: 0010:update_mst_stream_alloc_table+0x11e/0x130 [amdgpu] Code: 28 00 00 00 75 2b 48 8d 65 e0 5b 41 5c 41 5d 41 5e 5d c3 0fb6 06
49 89 1c 24 41 88 44 24 08 0f b6 46 01 41 88 44 24 09 eb 93 <0f> 0b e9 2f ff ff ff e8 a6 82 a3 c2 66 0f 1f 44 00 00 0f 1f 44 00
RSP: 0018:ffffac428127f5b0 EFLAGS: 00010202
RAX: 0000000000000002 RBX:ffff8d1e166eee80RCX:0000000000000000
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
RDX:
ffffac428127f668RSI:ffff8d1e166eee80RDI:ffffac428127f610
RBP:ffffac428127f640R08:ffffffffc03d94a8R09: 0000000000000000
R10:ffff8d1e24b02000R11:ffffac428127f5b0R12:ffff8d1e1b83d000
R13:ffff8d1e1bea0b08R14: 0000000000000002 R15:0000000000000002
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
FS: 00007fab23ffcd80(0000) GS:ffff8d1e28b40000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f151f1711e8 CR3: 00000005997c0000 CR4:
00000000003406e0Quoted 40 lines
Quoted 40 lines
Quoted 40 lines
Call Trace: ? mutex_lock+0xe/0x30 dc_link_allocate_mst_payload+0x9a/0x210 [amdgpu] ? dm_read_reg_func+0x39/0xb0 [amdgpu] ? core_link_enable_stream+0x656/0x730 [amdgpu] core_link_enable_stream+0x656/0x730 [amdgpu] dce110_apply_ctx_to_hw+0x58e/0x5d0 [amdgpu] ? dcn10_verify_allow_pstate_change_high+0x1d/0x280 [amdgpu] ? dcn10_wait_for_mpcc_disconnect+0x3c/0x130 [amdgpu] dc_commit_state+0x292/0x770 [amdgpu] ? add_timer+0x101/0x1f0 ? ttm_bo_put+0x1a1/0x2f0 [ttm] amdgpu_dm_atomic_commit_tail+0xb59/0x1ff0 [amdgpu] ? amdgpu_move_blit.constprop.0+0xb8/0x1f0 [amdgpu] ? amdgpu_bo_move+0x16d/0x2b0 [amdgpu] ? ttm_bo_handle_move_mem+0x118/0x570 [ttm] ? ttm_bo_validate+0x134/0x150 [ttm] ? dm_plane_helper_prepare_fb+0x1b9/0x2a0 [amdgpu] ? _cond_resched+0x15/0x30 ? wait_for_completion_timeout+0x38/0x160 ? _cond_resched+0x15/0x30 ? wait_for_completion_interruptible+0x33/0x190 commit_tail+0x94/0x130 [drm_kms_helper] drm_atomic_helper_commit+0x113/0x140 [drm_kms_helper] drm_atomic_helper_set_config+0x70/0xb0 [drm_kms_helper] drm_mode_setcrtc+0x194/0x6a0 [drm] ? _cond_resched+0x15/0x30 ? mutex_lock+0xe/0x30 ? drm_mode_getcrtc+0x180/0x180 [drm] drm_ioctl_kernel+0xaa/0xf0 [drm] drm_ioctl+0x208/0x390 [drm] ? drm_mode_getcrtc+0x180/0x180 [drm] amdgpu_drm_ioctl+0x49/0x80 [amdgpu] do_vfs_ioctl+0x458/0x6d0 ksys_ioctl+0x5e/0x90 __x64_sys_ioctl+0x16/0x20 do_syscall_64+0x55/0x1b0 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7fab2121f87b Code: 0f 1e fa 48 8b 05 0d 96 2c 00 64 c7 00 26 00 00 00 48 c7 c0Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
ff ff ff ff c3 66 0f 1f 44 00 00 f3 0f 1e fa b8 10 00 00 00 0f 05 <48> 3d 01
f0 ff ff 73 01 c3 48 8b 0d dd 95 2c 00 f7 d8 64 89 01 48
RSP: 002b:00007ffd045f9068 EFLAGS: 00000246ORIG_RAX:
0000000000000010
RAX: ffffffffffffffda RBX:00007ffd045f90a0RCX:00007fab2121f87b
RDX:00007ffd045f90a0RSI:00000000c06864a2RDI:000000000000000b
RBP:00007ffd045f90a0R08: 0000000000000000 R09:
000055dbd2985d10Quoted 1 line
Quoted 1 line
Quoted 1 line
R10:
000055dbd2196280R11: 0000000000000246 R12:
00000000c06864a2Quoted 1 line
Quoted 1 line
Quoted 1 line
R13:
000000000000000bR14: 0000000000000000 R15:
000055dbd2196280Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
---[ end trace 6ea888c24d2059cd ]---Note as well, I have only been able to reproduce this on setups with 2 MST displays.
Signed-off-by Lyude Paul <[email protected]>Quoted 6 lines
Quoted 2 lines
LGTM but would like Mikita or Wayne to have a look as well.
Acked-by Harry Wentland <[email protected]>I think its a good change and it definetely helps to deal with discreptency between drm and dc payload allocation tables. But I think we might not even need extra enable checks.
I think you're right here, I'll remove those in the next respin
Quoted 5 lines
Quoted 5 lines
Harry
Quoted 2 lines
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 7++++---
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
1 file changed, 4 insertions(+), 3 deletions(-)diff --git
a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.cb/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.cindex069b7a6f5597..252fa60c6775100644drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0
-0@@ -216,6 +216,7 @@ booldm_helpers_dp_mst_write_payload_allocation_table(
drm_dp_mst_reset_vcpi_slots(mst_mgr, mst_port);
}drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1
-0+/* If disabling, it's OK for this to fail */ ret =drm_dp_update_payload_part1 (mst_mgr);/* mst_mgr->->payloads are VC payload notify MST branch using DPCD or @@ -225,7 +226,7 @@ bool
dm_helpers_dp_mst_write_payload_allocation_table(get_payload_table(aconnector, proposed_table);Quoted 7 lines
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_write_payload_allocation_table( · line 230
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1
-1-if (ret) +if (ret && !enable)return false;Wouldn't it be better to check ret value, and instead of returning false just throw
DRM_ERRORmessage, sincedrm_dp_update_payload_part1only returns error if a port is not validated?You're right on avoiding returning here, that's probably a better idea since we want all steps to be run even if they don't succeed. I think we can skip the error message though, it's expected that modesets which disable displays will happen on ports that no longer can be validated.
Quoted 7 lines
Thank you,
MikitaQuoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool
Quoted 3 lines
return true;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0
-0@@ -299,9 +300,9 @@ booldm_helpers_dp_mst_send_payload_allocation(
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +2
-2if (!mst_mgr->mst_state)return false; +/* If disabling, it's OK for this to fail */ ret =drm_dp_update_payload_part2 (mst_mgr); - -if (ret) +if (enable && ret)return false;
Quoted 4 lines
Quoted 1 line
Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_send_payload_allocation( · line 308
Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0
-0if (!enable)--
Cheers,
Lyude Paul
--
Best regards,
Wayne Lin
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 1/1 drm/amd/dm/mst: Ignore payload update failures
In reply to Lyude PaulDisabling a display on MST can potentially happen after the entire MST topology has been removed, which means that we can't communicate with the topology at all in this scenario. Likewise, this also means that we can't properly update payloads on the topology and as such, it's a good idea to ignore payload update failures when disabling displays. Currently, amdgpu makes the mistake of halting the payload update process when any payload update failures occur, resulting in leaving DC's local copies of the payload tables out of date.
This ends up causing problems with hotplugging MST topologies, and causes modesets on the second hotplug to fail like so:
[drm] Failed to updateMST allocation table forpipe idx:1
------------[ cut here ]------------ WARNING: CPU: 5 PID: 1511 at drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link.c:2677 update_mst_stream_alloc_table+0x11e/0x130 [amdgpu] Modules linked in: cdc_ether usbnet fuse xt_conntrack nf_conntrack
nf_defrag_ipv6 libcrc32c nf_defrag_ipv4 ipt_REJECT nf_reject_ipv4 nft_counter nft_compat nf_tables nfnetlink tun bridge stp llc sunrpc vfat fat wmi_bmof uvcvideo snd_hda_codec_realtek snd_hda_codec_generic snd_hda_codec_hdmi videobuf2_vmalloc snd_hda_intel videobuf2_memops videobuf2_v4l2 snd_intel_dspcfg videobuf2_common crct10dif_pclmul snd_hda_codec videodev crc32_pclmul snd_hwdep snd_hda_core ghash_clmulni_intel snd_seq mc joydev pcspkr snd_seq_device snd_pcm sp5100_tco k10temp i2c_piix4 snd_timer thinkpad_acpi ledtrig_audio snd wmi soundcore video i2c_scmi acpi_cpufreq ip_tables amdgpu(O) rtsx_pci_sdmmc amd_iommu_v2 gpu_sched mmc_core i2c_algo_bit ttm drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops cec drm crc32c_intel serio_raw hid_multitouch r8152 mii nvme r8169 nvme_core rtsx_pci pinctrl_amd
CPU: 5 PID: 1511 Comm: gnome-shell Tainted: G O 5.5.0-rc7Lyude-Test+ #4 Hardware name: LENOVO FA495SIT26/FA495SIT26, BIOS R12ET22W(0.22 ) 01/31/2019 RIP: 0010:update_mst_stream_alloc_table+0x11e/0x130 [amdgpu] Code: 28 00 00 00 75 2b 48 8d 65 e0 5b 41 5c 41 5d 41 5e 5d c3 0f b6 06 49 89 1c 24 41 88 44 24 08 0f b6 46 01 41 88 44 24 09 eb 93 <0f> 0b e9 2f ff ff ff e8 a6 82 a3 c2 66 0f 1f 44 00 00 0f 1f 44 00 RSP: 0018:ffffac428127f5b0 EFLAGS: 00010202 RAX: 0000000000000002 RBX: ffff8d1e166eee80 RCX: 0000000000000000 RDX: ffffac428127f668 RSI: ffff8d1e166eee80 RDI: ffffac428127f610 RBP: ffffac428127f640 R08: ffffffffc03d94a8 R09: 0000000000000000 R10: ffff8d1e24b02000 R11: ffffac428127f5b0 R12: ffff8d1e1b83d000 R13: ffff8d1e1bea0b08 R14: 0000000000000002 R15: 0000000000000002 FS: 00007fab23ffcd80(0000) GS:ffff8d1e28b40000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f151f1711e8 CR3: 00000005997c0000 CR4: 00000000003406e0 Call Trace: ? mutex_lock+0xe/0x30 dc_link_allocate_mst_payload+0x9a/0x210 [amdgpu] ? dm_read_reg_func+0x39/0xb0 [amdgpu] ? core_link_enable_stream+0x656/0x730 [amdgpu] core_link_enable_stream+0x656/0x730 [amdgpu] dce110_apply_ctx_to_hw+0x58e/0x5d0 [amdgpu] ? dcn10_verify_allow_pstate_change_high+0x1d/0x280 [amdgpu] ? dcn10_wait_for_mpcc_disconnect+0x3c/0x130 [amdgpu] dc_commit_state+0x292/0x770 [amdgpu] ? add_timer+0x101/0x1f0 ? ttm_bo_put+0x1a1/0x2f0 [ttm] amdgpu_dm_atomic_commit_tail+0xb59/0x1ff0 [amdgpu] ? amdgpu_move_blit.constprop.0+0xb8/0x1f0 [amdgpu] ? amdgpu_bo_move+0x16d/0x2b0 [amdgpu] ? ttm_bo_handle_move_mem+0x118/0x570 [ttm] ? ttm_bo_validate+0x134/0x150 [ttm] ? dm_plane_helper_prepare_fb+0x1b9/0x2a0 [amdgpu] ? _cond_resched+0x15/0x30 ? wait_for_completion_timeout+0x38/0x160 ? _cond_resched+0x15/0x30 ? wait_for_completion_interruptible+0x33/0x190 commit_tail+0x94/0x130 [drm_kms_helper] drm_atomic_helper_commit+0x113/0x140 [drm_kms_helper] drm_atomic_helper_set_config+0x70/0xb0 [drm_kms_helper] drm_mode_setcrtc+0x194/0x6a0 [drm] ? _cond_resched+0x15/0x30 ? mutex_lock+0xe/0x30 ? drm_mode_getcrtc+0x180/0x180 [drm] drm_ioctl_kernel+0xaa/0xf0 [drm] drm_ioctl+0x208/0x390 [drm] ? drm_mode_getcrtc+0x180/0x180 [drm] amdgpu_drm_ioctl+0x49/0x80 [amdgpu] do_vfs_ioctl+0x458/0x6d0 ksys_ioctl+0x5e/0x90 __x64_sys_ioctl+0x16/0x20 do_syscall_64+0x55/0x1b0 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7fab2121f87b Code: 0f 1e fa 48 8b 05 0d 96 2c 00 64 c7 00 26 00 00 00 48 c7 c0 ff ff
ff ff c3 66 0f 1f 44 00 00 f3 0f 1e fa b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d dd 95 2c 00 f7 d8 64 89 01 48
RSP: 002b:00007ffd045f9068 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX: 00007ffd045f90a0 RCX: 00007fab2121f87b
RDX: 00007ffd045f90a0 RSI: 00000000c06864a2 RDI: 000000000000000b
RBP: 00007ffd045f90a0 R08: 0000000000000000 R09: 000055dbd2985d10
R10: 000055dbd2196280 R11: 0000000000000246 R12: 00000000c06864a2
R13: 000000000000000b R14: 0000000000000000 R15: 000055dbd2196280
---[ end trace 6ea888c24d2059cd ]---
Note as well, I have only been able to reproduce this on setups with 2 MST displays.
Changes since v1:
* Don't return false when part 1 or part 2 of updating the payloads fails, we don't want to abort at any step of the process even if things fail
--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +4 -9
@@ -216,7 +216,8 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(drm_dp_mst_reset_vcpi_slots (mst_mgr, mst_port); } - ret =drm_dp_update_payload_part1 (mst_mgr); +/* It's OK for this to fail */ +drm_dp_update_payload_part1 (mst_mgr);/* mst_mgr->->payloads are VC payload notify MST branch using DPCD or * AUX message. The sequence is slot 1-63 allocated sequence for each
@@ -225,9 +226,6 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(get_payload_table (aconnector, proposed_table); -if (ret) -return false; -return true; }
@@ -285,7 +283,6 @@ bool dm_helpers_dp_mst_send_payload_allocation(struct amdgpu_dm_connector *aconnector;struct drm_dp_mst_topology_mgr *mst_mgr;struct drm_dp_mst_port *mst_port; -int ret; aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context;
@@ -299,10 +296,8 @@ bool dm_helpers_dp_mst_send_payload_allocation(if (!mst_mgr->mst_state)return false; - ret =drm_dp_update_payload_part2 (mst_mgr); - -if (ret) -return false; +/* It's OK for this to fail */ +drm_dp_update_payload_part2 (mst_mgr);if (!enable)drm_dp_mst_deallocate_vcpi (mst_mgr, mst_port);
Signature · 1 line
2.24.1
Re: [PATCH v2] drm/amd/dm/mst: Ignore payload update failures
Quoted 126 lines · Lyude Paul
Disabling a display on MST can potentially happen after the entire MST topology has been removed, which means that we can't communicate with the topology at all in this scenario. Likewise, this also means that we can't properly update payloads on the topology and as such, it's a good idea to ignore payload update failures when disabling displays. Currently, amdgpu makes the mistake of halting the payload update process when any payload update failures occur, resulting in leaving DC's local copies of the payload tables out of date.
This ends up causing problems with hotplugging MST topologies, and causes modesets on the second hotplug to fail like so:
[drm] Failed to updateMST allocation table forpipe idx:1
------------[ cut here ]------------ WARNING: CPU: 5 PID: 1511 at drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link.c:2677 update_mst_stream_alloc_table+0x11e/0x130 [amdgpu] Modules linked in: cdc_ether usbnet fuse xt_conntrack nf_conntrack
nf_defrag_ipv6libcrc32cnf_defrag_ipv4ipt_REJECTnf_reject_ipv4nft_counternft_compatnf_tablesnfnetlink tun bridge stp llc sunrpc vfat fatwmi_bmofuvcvideosnd_hda_codec_realteksnd_hda_codec_genericsnd_hda_codec_hdmivideobuf2_vmallocsnd_hda_intelvideobuf2_memopsvideobuf2_v4l2snd_intel_dspcfgvideobuf2_commoncrct10dif_pclmulsnd_hda_codecvideodevcrc32_pclmulsnd_hwdepsnd_hda_coreghash_clmulni_intelsnd_seqmc joydev pcspkrsnd_seq_devicesnd_pcmsp5100_tcok10tempi2c_piix4snd_timerthinkpad_acpiledtrig_audiosnd wmi soundcore videoi2c_scmiacpi_cpufreqip_tablesamdgpu(O)rtsx_pci_sdmmcamd_iommu_v2gpu_schedmmc_corei2c_algo_bitttmdrm_kms_helpersyscopyarea sysfillrect sysimgbltfb_sys_fopscec drmcrc32c_intelserio_rawhid_multitouchr8152 mii nvme r8169nvme_corertsx_pcipinctrl_amdCPU: 5 PID: 1511 Comm: gnome-shell Tainted: G O 5.5.0-rc7Lyude-Test+ #4 Hardware name: LENOVO FA495SIT26/FA495SIT26, BIOS R12ET22W(0.22 ) 01/31/2019 RIP: 0010:update_mst_stream_alloc_table+0x11e/0x130 [amdgpu] Code: 28 00 00 00 75 2b 48 8d 65 e0 5b 41 5c 41 5d 41 5e 5d c3 0f b6 06 49 89 1c 24 41 88 44 24 08 0f b6 46 01 41 88 44 24 09 eb 93 <0f> 0b e9 2f ff ff ff e8 a6 82 a3 c2 66 0f 1f 44 00 00 0f 1f 44 00 RSP: 0018:ffffac428127f5b0 EFLAGS: 00010202 RAX: 0000000000000002 RBX: ffff8d1e166eee80 RCX: 0000000000000000 RDX: ffffac428127f668 RSI: ffff8d1e166eee80 RDI: ffffac428127f610 RBP: ffffac428127f640 R08: ffffffffc03d94a8 R09: 0000000000000000 R10: ffff8d1e24b02000 R11: ffffac428127f5b0 R12: ffff8d1e1b83d000 R13: ffff8d1e1bea0b08 R14: 0000000000000002 R15: 0000000000000002 FS: 00007fab23ffcd80(0000) GS:ffff8d1e28b40000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f151f1711e8 CR3: 00000005997c0000 CR4: 00000000003406e0 Call Trace: ? mutex_lock+0xe/0x30 dc_link_allocate_mst_payload+0x9a/0x210 [amdgpu] ? dm_read_reg_func+0x39/0xb0 [amdgpu] ? core_link_enable_stream+0x656/0x730 [amdgpu] core_link_enable_stream+0x656/0x730 [amdgpu] dce110_apply_ctx_to_hw+0x58e/0x5d0 [amdgpu] ? dcn10_verify_allow_pstate_change_high+0x1d/0x280 [amdgpu] ? dcn10_wait_for_mpcc_disconnect+0x3c/0x130 [amdgpu] dc_commit_state+0x292/0x770 [amdgpu] ? add_timer+0x101/0x1f0 ? ttm_bo_put+0x1a1/0x2f0 [ttm] amdgpu_dm_atomic_commit_tail+0xb59/0x1ff0 [amdgpu] ? amdgpu_move_blit.constprop.0+0xb8/0x1f0 [amdgpu] ? amdgpu_bo_move+0x16d/0x2b0 [amdgpu] ? ttm_bo_handle_move_mem+0x118/0x570 [ttm] ? ttm_bo_validate+0x134/0x150 [ttm] ? dm_plane_helper_prepare_fb+0x1b9/0x2a0 [amdgpu] ? _cond_resched+0x15/0x30 ? wait_for_completion_timeout+0x38/0x160 ? _cond_resched+0x15/0x30 ? wait_for_completion_interruptible+0x33/0x190 commit_tail+0x94/0x130 [drm_kms_helper] drm_atomic_helper_commit+0x113/0x140 [drm_kms_helper] drm_atomic_helper_set_config+0x70/0xb0 [drm_kms_helper] drm_mode_setcrtc+0x194/0x6a0 [drm] ? _cond_resched+0x15/0x30 ? mutex_lock+0xe/0x30 ? drm_mode_getcrtc+0x180/0x180 [drm] drm_ioctl_kernel+0xaa/0xf0 [drm] drm_ioctl+0x208/0x390 [drm] ? drm_mode_getcrtc+0x180/0x180 [drm] amdgpu_drm_ioctl+0x49/0x80 [amdgpu] do_vfs_ioctl+0x458/0x6d0 ksys_ioctl+0x5e/0x90 __x64_sys_ioctl+0x16/0x20 do_syscall_64+0x55/0x1b0 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7fab2121f87b Code: 0f 1e fa 48 8b 05 0d 96 2c 00 64 c7 00 26 00 00 00 48 c7 c0 ff ffff ff c3 66 0f 1f 44 00 00 f3 0f 1e fa b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d dd 95 2c 00 f7 d8 64 89 01 48
RSP: 002b:00007ffd045f9068 EFLAGS: 00000246ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX:00007ffd045f90a0RCX:00007fab2121f87b
RDX:00007ffd045f90a0RSI:00000000c06864a2RDI:000000000000000b
RBP:00007ffd045f90a0R08: 0000000000000000 R09:000055dbd2985d10
R10:000055dbd2196280R11: 0000000000000246 R12:00000000c06864a2
R13:000000000000000bR14: 0000000000000000 R15:000055dbd2196280---[ end trace 6ea888c24d2059cd ]---Note as well, I have only been able to reproduce this on setups with 2 MST displays.
Changes since v1:
* Don't return false when part 1 or part 2 of updating the payloads fails, we don't want to abort at any step of the process even if things failSigned-off-by Lyude Paul <[email protected]>Acked-by Harry Wentland <[email protected]>--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +2
-1@@ -216,7 +216,8 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(drm_dp_mst_reset_vcpi_slots (mst_mgr, mst_port); } - ret =drm_dp_update_payload_part1 (mst_mgr); +/* It's OK for this to fail */ +drm_dp_update_payload_part1 (mst_mgr);/* mst_mgr->->payloads are VC payload notify MST branch using DPCD or * AUX message. The sequence is slot 1-63 allocated sequence for each
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_write_payload_allocation_table( · line 230
Quoted 6 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0
-3@@ -225,9 +226,6 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(get_payload_table (aconnector, proposed_table); -if (ret) -return false; -
Sorry for being picky, but I think this might cause compilation error on some systems for having unused variable (int ret). Its better just to strip out both ret integer declarations.
Otherwise the patch is good. Thanks again!
Mikita
Quoted 15 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0
-1return true; }@@ -285,7 +283,6 @@ bool dm_helpers_dp_mst_send_payload_allocation(struct amdgpu_dm_connector *aconnector;struct drm_dp_mst_topology_mgr *mst_mgr;struct drm_dp_mst_port *mst_port; -int ret; aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context;@@ -299,10 +296,8 @@ bool dm_helpers_dp_mst_send_payload_allocation(if (!mst_mgr->mst_state)return false;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_send_payload_allocation( · line 303
Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +2
-4- ret =drm_dp_update_payload_part2 (mst_mgr); - -if (ret) -return false; +/* It's OK for this to fail */ +drm_dp_update_payload_part2 (mst_mgr);if (!enable)drm_dp_mst_deallocate_vcpi (mst_mgr, mst_port);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH v2] drm/amd/dm/mst: Ignore payload update failures
Quoted 134 lines · Mikita Lipski
Quoted 133 lines · Lyude Paul
Disabling a display on MST can potentially happen after the entire MST topology has been removed, which means that we can't communicate with the topology at all in this scenario. Likewise, this also means that we can't properly update payloads on the topology and as such, it's a good idea to ignore payload update failures when disabling displays. Currently, amdgpu makes the mistake of halting the payload update process when any payload update failures occur, resulting in leaving DC's local copies of the payload tables out of date.
This ends up causing problems with hotplugging MST topologies, and causes modesets on the second hotplug to fail like so:
[drm] Failed to updateMST allocation table forpipe idx:1
------------[ cut here ]------------ WARNING: CPU: 5 PID: 1511 at drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link.c:2677 update_mst_stream_alloc_table+0x11e/0x130 [amdgpu] Modules linked in: cdc_ether usbnet fuse xt_conntrack nf_conntrack
nf_defrag_ipv6libcrc32cnf_defrag_ipv4ipt_REJECTnf_reject_ipv4nft_counternft_compatnf_tablesnfnetlink tun bridge stp llc sunrpc vfat fatwmi_bmofuvcvideosnd_hda_codec_realteksnd_hda_codec_genericsnd_hda_codec_hdmivideobuf2_vmallocsnd_hda_intelvideobuf2_memopsvideobuf2_v4l2snd_intel_dspcfgvideobuf2_commoncrct10dif_pclmulsnd_hda_codecvideodevcrc32_pclmulsnd_hwdepsnd_hda_coreghash_clmulni_intelsnd_seqmc joydev pcspkrsnd_seq_devicesnd_pcmsp5100_tcok10tempi2c_piix4snd_timerthinkpad_acpiledtrig_audiosnd wmi soundcore videoi2c_scmiacpi_cpufreqip_tablesamdgpu(O)rtsx_pci_sdmmcamd_iommu_v2gpu_schedmmc_corei2c_algo_bitttmdrm_kms_helpersyscopyarea sysfillrect sysimgbltfb_sys_fopscec drmcrc32c_intelserio_rawhid_multitouchr8152 mii nvme r8169nvme_corertsx_pcipinctrl_amdCPU: 5 PID: 1511 Comm: gnome-shell Tainted: G O 5.5.0- rc7Lyude-Test+ #4 Hardware name: LENOVO FA495SIT26/FA495SIT26, BIOS R12ET22W(0.22 ) 01/31/2019 RIP: 0010:update_mst_stream_alloc_table+0x11e/0x130 [amdgpu] Code: 28 00 00 00 75 2b 48 8d 65 e0 5b 41 5c 41 5d 41 5e 5d c3 0f b6 06 49 89 1c 24 41 88 44 24 08 0f b6 46 01 41 88 44 24 09 eb 93 <0f> 0b e9 2f ff ff ff e8 a6 82 a3 c2 66 0f 1f 44 00 00 0f 1f 44 00 RSP: 0018:ffffac428127f5b0 EFLAGS: 00010202 RAX: 0000000000000002 RBX: ffff8d1e166eee80 RCX: 0000000000000000 RDX: ffffac428127f668 RSI: ffff8d1e166eee80 RDI: ffffac428127f610 RBP: ffffac428127f640 R08: ffffffffc03d94a8 R09: 0000000000000000 R10: ffff8d1e24b02000 R11: ffffac428127f5b0 R12: ffff8d1e1b83d000 R13: ffff8d1e1bea0b08 R14: 0000000000000002 R15: 0000000000000002 FS: 00007fab23ffcd80(0000) GS:ffff8d1e28b40000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f151f1711e8 CR3: 00000005997c0000 CR4: 00000000003406e0 Call Trace: ? mutex_lock+0xe/0x30 dc_link_allocate_mst_payload+0x9a/0x210 [amdgpu] ? dm_read_reg_func+0x39/0xb0 [amdgpu] ? core_link_enable_stream+0x656/0x730 [amdgpu] core_link_enable_stream+0x656/0x730 [amdgpu] dce110_apply_ctx_to_hw+0x58e/0x5d0 [amdgpu] ? dcn10_verify_allow_pstate_change_high+0x1d/0x280 [amdgpu] ? dcn10_wait_for_mpcc_disconnect+0x3c/0x130 [amdgpu] dc_commit_state+0x292/0x770 [amdgpu] ? add_timer+0x101/0x1f0 ? ttm_bo_put+0x1a1/0x2f0 [ttm] amdgpu_dm_atomic_commit_tail+0xb59/0x1ff0 [amdgpu] ? amdgpu_move_blit.constprop.0+0xb8/0x1f0 [amdgpu] ? amdgpu_bo_move+0x16d/0x2b0 [amdgpu] ? ttm_bo_handle_move_mem+0x118/0x570 [ttm] ? ttm_bo_validate+0x134/0x150 [ttm] ? dm_plane_helper_prepare_fb+0x1b9/0x2a0 [amdgpu] ? _cond_resched+0x15/0x30 ? wait_for_completion_timeout+0x38/0x160 ? _cond_resched+0x15/0x30 ? wait_for_completion_interruptible+0x33/0x190 commit_tail+0x94/0x130 [drm_kms_helper] drm_atomic_helper_commit+0x113/0x140 [drm_kms_helper] drm_atomic_helper_set_config+0x70/0xb0 [drm_kms_helper] drm_mode_setcrtc+0x194/0x6a0 [drm] ? _cond_resched+0x15/0x30 ? mutex_lock+0xe/0x30 ? drm_mode_getcrtc+0x180/0x180 [drm] drm_ioctl_kernel+0xaa/0xf0 [drm] drm_ioctl+0x208/0x390 [drm] ? drm_mode_getcrtc+0x180/0x180 [drm] amdgpu_drm_ioctl+0x49/0x80 [amdgpu] do_vfs_ioctl+0x458/0x6d0 ksys_ioctl+0x5e/0x90 __x64_sys_ioctl+0x16/0x20 do_syscall_64+0x55/0x1b0 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7fab2121f87b Code: 0f 1e fa 48 8b 05 0d 96 2c 00 64 c7 00 26 00 00 00 48 c7 c0 ff ffff ff c3 66 0f 1f 44 00 00 f3 0f 1e fa b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d dd 95 2c 00 f7 d8 64 89 01 48
RSP: 002b:00007ffd045f9068 EFLAGS: 00000246ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX:00007ffd045f90a0RCX:00007fab2121f87b
RDX:00007ffd045f90a0RSI:00000000c06864a2RDI:000000000000000b
RBP:00007ffd045f90a0R08: 0000000000000000 R09:000055dbd2985d10
R10:000055dbd2196280R11: 0000000000000246 R12:00000000c06864a2
R13:000000000000000bR14: 0000000000000000 R15:000055dbd2196280---[ end trace 6ea888c24d2059cd ]---Note as well, I have only been able to reproduce this on setups with 2 MST displays.
Changes since v1:
* Don't return false when part 1 or part 2 of updating the payloads fails, we don't want to abort at any step of the process even if things failSigned-off-by Lyude Paul <[email protected]>Acked-by Harry Wentland <[email protected]>--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +2
-1@@ -216,7 +216,8 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(drm_dp_mst_reset_vcpi_slots (mst_mgr, mst_port); } - ret =drm_dp_update_payload_part1 (mst_mgr); +/* It's OK for this to fail */ +drm_dp_update_payload_part1 (mst_mgr);/* mst_mgr->->payloads are VC payload notify MST branch using DPCD or * AUX message. The sequence is slot 1-63 allocated sequence for each @@ -225,9 +226,6 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(get_payload_table (aconnector, proposed_table);
Quoted 7 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_write_payload_allocation_table( · line 230
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0
-3-if (ret) -return false; -Sorry for being picky, but I think this might cause compilation error on some systems for having unused variable (int ret). Its better just to strip out both ret integer declarations.
No problem! It wouldn't be fair if I was the only one who got to be picky anyway ;)
Quoted 32 lines
Otherwise the patch is good. Thanks again!
Reviewed-by Mikita Lipski <[email protected]>Mikita
Quoted 25 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +2
-5return true; }@@ -285,7 +283,6 @@ bool dm_helpers_dp_mst_send_payload_allocation(struct amdgpu_dm_connector *aconnector;struct drm_dp_mst_topology_mgr *mst_mgr;struct drm_dp_mst_port *mst_port; -int ret; aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context;@@ -299,10 +296,8 @@ bool dm_helpers_dp_mst_send_payload_allocation(if (!mst_mgr->mst_state)return false; - ret =drm_dp_update_payload_part2 (mst_mgr); - -if (ret) -return false; +/* It's OK for this to fail */ +drm_dp_update_payload_part2 (mst_mgr);if (!enable)drm_dp_mst_deallocate_vcpi (mst_mgr, mst_port);
Signature · 7 lines
Cheers, Lyude Paul _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2] drm/amd/dm/mst: Ignore payload update failures
Quoted 147 lines · Lyude Paul
Quoted 138 lines · Mikita Lipski
Quoted 137 lines · Lyude Paul
Disabling a display on MST can potentially happen after the entire MST topology has been removed, which means that we can't communicate with the topology at all in this scenario. Likewise, this also means that we can't properly update payloads on the topology and as such, it's a good idea to ignore payload update failures when disabling displays. Currently, amdgpu makes the mistake of halting the payload update process when any payload update failures occur, resulting in leaving DC's local copies of the payload tables out of date.
This ends up causing problems with hotplugging MST topologies, and causes modesets on the second hotplug to fail like so:
[drm] Failed to updateMST allocation table forpipe idx:1
------------[ cut here ]------------ WARNING: CPU: 5 PID: 1511 at drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link.c:2677 update_mst_stream_alloc_table+0x11e/0x130 [amdgpu] Modules linked in: cdc_ether usbnet fuse xt_conntrack nf_conntrack
nf_defrag_ipv6libcrc32cnf_defrag_ipv4ipt_REJECTnf_reject_ipv4nft_counternft_compatnf_tablesnfnetlink tun bridge stp llc sunrpc vfat fatwmi_bmofuvcvideosnd_hda_codec_realteksnd_hda_codec_genericsnd_hda_codec_hdmivideobuf2_vmallocsnd_hda_intelvideobuf2_memopsvideobuf2_v4l2snd_intel_dspcfgvideobuf2_commoncrct10dif_pclmulsnd_hda_codecvideodevcrc32_pclmulsnd_hwdepsnd_hda_coreghash_clmulni_intelsnd_seqmc joydev pcspkrsnd_seq_devicesnd_pcmsp5100_tcok10tempi2c_piix4snd_timerthinkpad_acpiledtrig_audiosnd wmi soundcore videoi2c_scmiacpi_cpufreqip_tablesamdgpu(O)rtsx_pci_sdmmcamd_iommu_v2gpu_schedmmc_corei2c_algo_bitttmdrm_kms_helpersyscopyarea sysfillrect sysimgbltfb_sys_fopscec drmcrc32c_intelserio_rawhid_multitouchr8152 mii nvme r8169nvme_corertsx_pcipinctrl_amdCPU: 5 PID: 1511 Comm: gnome-shell Tainted: G O 5.5.0- rc7Lyude-Test+ #4 Hardware name: LENOVO FA495SIT26/FA495SIT26, BIOS R12ET22W(0.22 ) 01/31/2019 RIP: 0010:update_mst_stream_alloc_table+0x11e/0x130 [amdgpu] Code: 28 00 00 00 75 2b 48 8d 65 e0 5b 41 5c 41 5d 41 5e 5d c3 0f b6 06 49 89 1c 24 41 88 44 24 08 0f b6 46 01 41 88 44 24 09 eb 93 <0f> 0b e9 2f ff ff ff e8 a6 82 a3 c2 66 0f 1f 44 00 00 0f 1f 44 00 RSP: 0018:ffffac428127f5b0 EFLAGS: 00010202 RAX: 0000000000000002 RBX: ffff8d1e166eee80 RCX: 0000000000000000 RDX: ffffac428127f668 RSI: ffff8d1e166eee80 RDI: ffffac428127f610 RBP: ffffac428127f640 R08: ffffffffc03d94a8 R09: 0000000000000000 R10: ffff8d1e24b02000 R11: ffffac428127f5b0 R12: ffff8d1e1b83d000 R13: ffff8d1e1bea0b08 R14: 0000000000000002 R15: 0000000000000002 FS: 00007fab23ffcd80(0000) GS:ffff8d1e28b40000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f151f1711e8 CR3: 00000005997c0000 CR4: 00000000003406e0 Call Trace: ? mutex_lock+0xe/0x30 dc_link_allocate_mst_payload+0x9a/0x210 [amdgpu] ? dm_read_reg_func+0x39/0xb0 [amdgpu] ? core_link_enable_stream+0x656/0x730 [amdgpu] core_link_enable_stream+0x656/0x730 [amdgpu] dce110_apply_ctx_to_hw+0x58e/0x5d0 [amdgpu] ? dcn10_verify_allow_pstate_change_high+0x1d/0x280 [amdgpu] ? dcn10_wait_for_mpcc_disconnect+0x3c/0x130 [amdgpu] dc_commit_state+0x292/0x770 [amdgpu] ? add_timer+0x101/0x1f0 ? ttm_bo_put+0x1a1/0x2f0 [ttm] amdgpu_dm_atomic_commit_tail+0xb59/0x1ff0 [amdgpu] ? amdgpu_move_blit.constprop.0+0xb8/0x1f0 [amdgpu] ? amdgpu_bo_move+0x16d/0x2b0 [amdgpu] ? ttm_bo_handle_move_mem+0x118/0x570 [ttm] ? ttm_bo_validate+0x134/0x150 [ttm] ? dm_plane_helper_prepare_fb+0x1b9/0x2a0 [amdgpu] ? _cond_resched+0x15/0x30 ? wait_for_completion_timeout+0x38/0x160 ? _cond_resched+0x15/0x30 ? wait_for_completion_interruptible+0x33/0x190 commit_tail+0x94/0x130 [drm_kms_helper] drm_atomic_helper_commit+0x113/0x140 [drm_kms_helper] drm_atomic_helper_set_config+0x70/0xb0 [drm_kms_helper] drm_mode_setcrtc+0x194/0x6a0 [drm] ? _cond_resched+0x15/0x30 ? mutex_lock+0xe/0x30 ? drm_mode_getcrtc+0x180/0x180 [drm] drm_ioctl_kernel+0xaa/0xf0 [drm] drm_ioctl+0x208/0x390 [drm] ? drm_mode_getcrtc+0x180/0x180 [drm] amdgpu_drm_ioctl+0x49/0x80 [amdgpu] do_vfs_ioctl+0x458/0x6d0 ksys_ioctl+0x5e/0x90 __x64_sys_ioctl+0x16/0x20 do_syscall_64+0x55/0x1b0 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7fab2121f87b Code: 0f 1e fa 48 8b 05 0d 96 2c 00 64 c7 00 26 00 00 00 48 c7 c0 ff ffff ff c3 66 0f 1f 44 00 00 f3 0f 1e fa b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d dd 95 2c 00 f7 d8 64 89 01 48
RSP: 002b:00007ffd045f9068 EFLAGS: 00000246ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX:00007ffd045f90a0RCX:00007fab2121f87b
RDX:00007ffd045f90a0RSI:00000000c06864a2RDI:000000000000000b
RBP:00007ffd045f90a0R08: 0000000000000000 R09:000055dbd2985d10
R10:000055dbd2196280R11: 0000000000000246 R12:00000000c06864a2
R13:000000000000000bR14: 0000000000000000 R15:000055dbd2196280---[ end trace 6ea888c24d2059cd ]---Note as well, I have only been able to reproduce this on setups with 2 MST displays.
Changes since v1:
* Don't return false when part 1 or part 2 of updating the payloads fails, we don't want to abort at any step of the process even if things failSigned-off-by Lyude Paul <[email protected]>Acked-by Harry Wentland <[email protected]>--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0
-0@@ -216,7 +216,8 @@ booldm_helpers_dp_mst_write_payload_allocation_table(
drm_dp_mst_reset_vcpi_slots(mst_mgr, mst_port);
}drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +2
-1- ret =drm_dp_update_payload_part1 (mst_mgr); +/* It's OK for this to fail */ +drm_dp_update_payload_part1 (mst_mgr);/* mst_mgr->->payloads are VC payload notify MST branch using DPCD or
* AUX message. The sequence is slot 1-63 allocated sequence
for eachdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0
-0@@ -225,9 +226,6 @@ booldm_helpers_dp_mst_write_payload_allocation_table(
get_payload_table(aconnector, proposed_table);Quoted 7 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_write_payload_allocation_table( · line 230
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0
-3-if (ret) -return false; -Sorry for being picky, but I think this might cause compilation error on some systems for having unused variable (int ret). Its better just to strip out both ret integer declarations.
Quoted 2 lines
No problem! It wouldn't be fair if I was the only one who got to be picky anyway ;)
Actually, I think you might have made a mistake here - ret is still used in this function, mind double checking?
Quoted 33 lines
Quoted 33 lines
Otherwise the patch is good. Thanks again!
Reviewed-by Mikita Lipski <[email protected]>Mikita
Quoted 26 lines
return true; }drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +2
-5@@ -285,7 +283,6 @@ bool dm_helpers_dp_mst_send_payload_allocation(struct amdgpu_dm_connector *aconnector;struct drm_dp_mst_topology_mgr *mst_mgr;struct drm_dp_mst_port *mst_port; -int ret; aconnector = (struct amdgpu_dm_connector *)stream- >dm_stream_context;@@ -299,10 +296,8 @@ bool dm_helpers_dp_mst_send_payload_allocation(if (!mst_mgr->mst_state)return false; - ret =drm_dp_update_payload_part2 (mst_mgr); - -if (ret) -return false; +/* It's OK for this to fail */ +drm_dp_update_payload_part2 (mst_mgr);if (!enable)drm_dp_mst_deallocate_vcpi (mst_mgr, mst_port);
Signature · 2 lines
Cheers, Lyude Paul
Re: [PATCH v2] drm/amd/dm/mst: Ignore payload update failures
Quoted 148 lines · Lyude Paul
Quoted 147 lines · Lyude Paul
Quoted 145 lines · Mikita Lipski
Quoted 137 lines · Lyude Paul
Disabling a display on MST can potentially happen after the entire MST topology has been removed, which means that we can't communicate with the topology at all in this scenario. Likewise, this also means that we can't properly update payloads on the topology and as such, it's a good idea to ignore payload update failures when disabling displays. Currently, amdgpu makes the mistake of halting the payload update process when any payload update failures occur, resulting in leaving DC's local copies of the payload tables out of date.
This ends up causing problems with hotplugging MST topologies, and causes modesets on the second hotplug to fail like so:
[drm] Failed to updateMST allocation table forpipe idx:1
------------[ cut here ]------------ WARNING: CPU: 5 PID: 1511 at drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link.c:2677 update_mst_stream_alloc_table+0x11e/0x130 [amdgpu] Modules linked in: cdc_ether usbnet fuse xt_conntrack nf_conntrack
nf_defrag_ipv6libcrc32cnf_defrag_ipv4ipt_REJECTnf_reject_ipv4nft_counternft_compatnf_tablesnfnetlink tun bridge stp llc sunrpc vfat fatwmi_bmofuvcvideosnd_hda_codec_realteksnd_hda_codec_genericsnd_hda_codec_hdmivideobuf2_vmallocsnd_hda_intelvideobuf2_memopsvideobuf2_v4l2snd_intel_dspcfgvideobuf2_commoncrct10dif_pclmulsnd_hda_codecvideodevcrc32_pclmulsnd_hwdepsnd_hda_coreghash_clmulni_intelsnd_seqmc joydev pcspkrsnd_seq_devicesnd_pcmsp5100_tcok10tempi2c_piix4snd_timerthinkpad_acpiledtrig_audiosnd wmi soundcore videoi2c_scmiacpi_cpufreqip_tablesamdgpu(O)rtsx_pci_sdmmcamd_iommu_v2gpu_schedmmc_corei2c_algo_bitttmdrm_kms_helpersyscopyarea sysfillrect sysimgbltfb_sys_fopscec drmcrc32c_intelserio_rawhid_multitouchr8152 mii nvme r8169nvme_corertsx_pcipinctrl_amdCPU: 5 PID: 1511 Comm: gnome-shell Tainted: G O 5.5.0- rc7Lyude-Test+ #4 Hardware name: LENOVO FA495SIT26/FA495SIT26, BIOS R12ET22W(0.22 ) 01/31/2019 RIP: 0010:update_mst_stream_alloc_table+0x11e/0x130 [amdgpu] Code: 28 00 00 00 75 2b 48 8d 65 e0 5b 41 5c 41 5d 41 5e 5d c3 0f b6 06 49 89 1c 24 41 88 44 24 08 0f b6 46 01 41 88 44 24 09 eb 93 <0f> 0b e9 2f ff ff ff e8 a6 82 a3 c2 66 0f 1f 44 00 00 0f 1f 44 00 RSP: 0018:ffffac428127f5b0 EFLAGS: 00010202 RAX: 0000000000000002 RBX: ffff8d1e166eee80 RCX: 0000000000000000 RDX: ffffac428127f668 RSI: ffff8d1e166eee80 RDI: ffffac428127f610 RBP: ffffac428127f640 R08: ffffffffc03d94a8 R09: 0000000000000000 R10: ffff8d1e24b02000 R11: ffffac428127f5b0 R12: ffff8d1e1b83d000 R13: ffff8d1e1bea0b08 R14: 0000000000000002 R15: 0000000000000002 FS: 00007fab23ffcd80(0000) GS:ffff8d1e28b40000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f151f1711e8 CR3: 00000005997c0000 CR4: 00000000003406e0 Call Trace: ? mutex_lock+0xe/0x30 dc_link_allocate_mst_payload+0x9a/0x210 [amdgpu] ? dm_read_reg_func+0x39/0xb0 [amdgpu] ? core_link_enable_stream+0x656/0x730 [amdgpu] core_link_enable_stream+0x656/0x730 [amdgpu] dce110_apply_ctx_to_hw+0x58e/0x5d0 [amdgpu] ? dcn10_verify_allow_pstate_change_high+0x1d/0x280 [amdgpu] ? dcn10_wait_for_mpcc_disconnect+0x3c/0x130 [amdgpu] dc_commit_state+0x292/0x770 [amdgpu] ? add_timer+0x101/0x1f0 ? ttm_bo_put+0x1a1/0x2f0 [ttm] amdgpu_dm_atomic_commit_tail+0xb59/0x1ff0 [amdgpu] ? amdgpu_move_blit.constprop.0+0xb8/0x1f0 [amdgpu] ? amdgpu_bo_move+0x16d/0x2b0 [amdgpu] ? ttm_bo_handle_move_mem+0x118/0x570 [ttm] ? ttm_bo_validate+0x134/0x150 [ttm] ? dm_plane_helper_prepare_fb+0x1b9/0x2a0 [amdgpu] ? _cond_resched+0x15/0x30 ? wait_for_completion_timeout+0x38/0x160 ? _cond_resched+0x15/0x30 ? wait_for_completion_interruptible+0x33/0x190 commit_tail+0x94/0x130 [drm_kms_helper] drm_atomic_helper_commit+0x113/0x140 [drm_kms_helper] drm_atomic_helper_set_config+0x70/0xb0 [drm_kms_helper] drm_mode_setcrtc+0x194/0x6a0 [drm] ? _cond_resched+0x15/0x30 ? mutex_lock+0xe/0x30 ? drm_mode_getcrtc+0x180/0x180 [drm] drm_ioctl_kernel+0xaa/0xf0 [drm] drm_ioctl+0x208/0x390 [drm] ? drm_mode_getcrtc+0x180/0x180 [drm] amdgpu_drm_ioctl+0x49/0x80 [amdgpu] do_vfs_ioctl+0x458/0x6d0 ksys_ioctl+0x5e/0x90 __x64_sys_ioctl+0x16/0x20 do_syscall_64+0x55/0x1b0 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7fab2121f87b Code: 0f 1e fa 48 8b 05 0d 96 2c 00 64 c7 00 26 00 00 00 48 c7 c0 ff ffff ff c3 66 0f 1f 44 00 00 f3 0f 1e fa b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d dd 95 2c 00 f7 d8 64 89 01 48
RSP: 002b:00007ffd045f9068 EFLAGS: 00000246ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX:00007ffd045f90a0RCX:00007fab2121f87b
RDX:00007ffd045f90a0RSI:00000000c06864a2RDI:000000000000000b
RBP:00007ffd045f90a0R08: 0000000000000000 R09:000055dbd2985d10
R10:000055dbd2196280R11: 0000000000000246 R12:00000000c06864a2
R13:000000000000000bR14: 0000000000000000 R15:000055dbd2196280---[ end trace 6ea888c24d2059cd ]---Note as well, I have only been able to reproduce this on setups with 2 MST displays.
Changes since v1:
* Don't return false when part 1 or part 2 of updating the payloads fails, we don't want to abort at any step of the process even if things failSigned-off-by Lyude Paul <[email protected]>Acked-by Harry Wentland <[email protected]>--- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0
-0@@ -216,7 +216,8 @@ booldm_helpers_dp_mst_write_payload_allocation_table(
drm_dp_mst_reset_vcpi_slots(mst_mgr, mst_port); }drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +2
-1- ret =drm_dp_update_payload_part1 (mst_mgr); +/* It's OK for this to fail */ +drm_dp_update_payload_part1 (mst_mgr);/* mst_mgr->->payloads are VC payload notify MST branch using DPCD or
* AUX message. The sequence is slot 1-63 allocated sequence
for eachdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0
-0@@ -225,9 +226,6 @@ booldm_helpers_dp_mst_write_payload_allocation_table(
get_payload_table(aconnector, proposed_table);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_write_payload_allocation_table( · line 230
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0
-3-if (ret) -return false; -Sorry for being picky, but I think this might cause compilation error on some systems for having unused variable (int ret). Its better just to strip out both ret integer declarations.
Quoted 6 lines
Quoted 2 lines
No problem! It wouldn't be fair if I was the only one who got to be picky anyway ;)
Actually, I think you might have made a mistake here - ret is still used in this function, mind double checking?
Sorry, yes you are correct, I only meant dm_helpers_dp_mst_send_payload_allocation function.
The ret variable is still used in dm_helpers_dp_mst_write_payload_allocation_table.
Quoted 33 lines
Quoted 33 lines
Quoted 33 lines
Otherwise the patch is good. Thanks again!
Reviewed-by Mikita Lipski <[email protected]>Mikita
Quoted 26 lines
return true; }drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +2
-5@@ -285,7 +283,6 @@ bool dm_helpers_dp_mst_send_payload_allocation(struct amdgpu_dm_connector *aconnector;struct drm_dp_mst_topology_mgr *mst_mgr;struct drm_dp_mst_port *mst_port; -int ret; aconnector = (struct amdgpu_dm_connector *)stream- > dm_stream_context;@@ -299,10 +296,8 @@ bool dm_helpers_dp_mst_send_payload_allocation(if (!mst_mgr->mst_state)return false; - ret =drm_dp_update_payload_part2 (mst_mgr); - -if (ret) -return false; +/* It's OK for this to fail */ +drm_dp_update_payload_part2 (mst_mgr);if (!enable)drm_dp_mst_deallocate_vcpi (mst_mgr, mst_port);
Signature · 8 lines
Thanks, Mikita Lipski Software Engineer, AMD [email protected] _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx