Hi!
I bisected an issue of the 6.0 kernel which started happening after
6.0-rc7 on all my machines.
Backtrace of this issue looks like as:
[ 2807.339439] ------------[ cut here ]------------
[ 2807.339445] WARNING: CPU: 11 PID: 2061 at
drivers/gpu/drm/drm_modeset_lock.c:276
drm_modeset_drop_locks+0x63/0x70
[ 2807.339453] Modules linked in: tls uinput rfcomm snd_seq_dummy
snd_hrtimer nft_objref nf_conntrack_netbios_ns nf_conntrack_broadcast
nft_fib_inet nft_fib_ipv4 nft_fib_ipv6 nft_fib nft_reject_inet
nf_reject_ipv4 nf_reject_ipv6 nft_reject nft_ct nft_chain_nat nf_nat
nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 ip_set nf_tables nfnetlink
qrtr bnep intel_rapl_msr intel_rapl_common snd_sof_amd_renoir
snd_sof_amd_acp snd_sof_pci snd_hda_codec_realtek sunrpc snd_sof
snd_hda_codec_hdmi snd_hda_codec_generic snd_sof_utils snd_hda_intel
snd_intel_dspcfg mt7921e snd_intel_sdw_acpi binfmt_misc snd_soc_core
mt7921_common snd_hda_codec snd_compress vfat ac97_bus edac_mce_amd
mt76_connac_lib snd_pcm_dmaengine fat snd_hda_core snd_rpl_pci_acp6x
snd_pci_acp6x mt76 btusb snd_hwdep kvm_amd btrtl snd_seq btbcm
mac80211 snd_seq_device kvm btintel btmtk libarc4 snd_pcm
snd_pci_acp5x bluetooth snd_timer snd_rn_pci_acp3x irqbypass
snd_acp_config snd_soc_acpi cfg80211 rapl snd joydev pcspkr
asus_nb_wmi wmi_bmof
[ 2807.339519] snd_pci_acp3x soundcore i2c_piix4 k10temp amd_pmc
asus_wireless zram amdgpu drm_ttm_helper ttm hid_asus asus_wmi
crct10dif_pclmul iommu_v2 crc32_pclmul ledtrig_audio crc32c_intel
gpu_sched sparse_keymap platform_profile hid_multitouch
polyval_clmulni nvme ucsi_acpi drm_buddy polyval_generic
drm_display_helper ghash_clmulni_intel serio_raw nvme_core ccp
typec_ucsi rfkill sp5100_tco r8169 cec nvme_common typec wmi video
i2c_hid_acpi i2c_hid ip6_tables ip_tables fuse
[ 2807.339540] Unloaded tainted modules: acpi_cpufreq():1
acpi_cpufreq():1 acpi_cpufreq():1 acpi_cpufreq():1 acpi_cpufreq():1
acpi_cpufreq():1 acpi_cpufreq():1 acpi_cpufreq():1 acpi_cpufreq():1
amd64_edac():1 acpi_cpufreq():1 acpi_cpufreq():1 amd64_edac():1
amd64_edac():1 acpi_cpufreq():1 pcc_cpufreq():1 fjes():1
amd64_edac():1 acpi_cpufreq():1 amd64_edac():1 acpi_cpufreq():1
fjes():1 pcc_cpufreq():1 amd64_edac():1 acpi_cpufreq():1 fjes():1
amd64_edac():1 acpi_cpufreq():1 pcc_cpufreq():1 amd64_edac():1
fjes():1 acpi_cpufreq():1 acpi_cpufreq():1 pcc_cpufreq():1
amd64_edac():1 fjes():1 acpi_cpufreq():1 amd64_edac():1
pcc_cpufreq():1 acpi_cpufreq():1 fjes():1 amd64_edac():1
pcc_cpufreq():1 pcc_cpufreq():1 amd64_edac():1 acpi_cpufreq():1
fjes():1 pcc_cpufreq():1 amd64_edac():1 acpi_cpufreq():1
acpi_cpufreq():1 amd64_edac():1 pcc_cpufreq():1 fjes():1
acpi_cpufreq():1 amd64_edac():1 pcc_cpufreq():1 amd64_edac():1
acpi_cpufreq():1 fjes():1 pcc_cpufreq():1 acpi_cpufreq():1
pcc_cpufreq():1 fjes():1
[ 2807.339579] acpi_cpufreq():1 fjes():1 pcc_cpufreq():1
acpi_cpufreq():1 pcc_cpufreq():1 acpi_cpufreq():1 fjes():1
acpi_cpufreq():1 pcc_cpufreq():1 fjes():1 pcc_cpufreq():1
acpi_cpufreq():1 fjes():1 acpi_cpufreq():1 fjes():1 fjes():1 fjes():1
fjes():1 fjes():1 fjes():1 fjes():1 fjes():1 fjes():1 fjes():1
fjes():1 fjes():1 fjes():1 fjes():1
[ 2807.339596] CPU: 11 PID: 2061 Comm: gnome-shell Tainted: G W
L 6.0.0-rc4-07-cb0eca01ad9756e853efec3301203c2b5b45aa9f+ #16
[ 2807.339598] Hardware name: ASUSTeK COMPUTER INC. ROG Strix
G513QY_G513QY/G513QY, BIOS G513QY.318 03/29/2022
[ 2807.339600] RIP: 0010:drm_modeset_drop_locks+0x63/0x70
[ 2807.339602] Code: 42 08 48 89 10 48 89 1b 48 8d bb 50 ff ff ff 48
89 5b 08 e8 3f 41 55 00 48 8b 45 78 49 39 c4 75 c6 5b 5d 41 5c c3 cc
cc cc cc <0f> 0b eb ac 66 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 41 55
41 54
[ 2807.339604] RSP: 0018:ffffb6ad46e07b80 EFLAGS: 00010282
[ 2807.339606] RAX: 0000000000000001 RBX: 0000000000000000 RCX: 0000000000000002
[ 2807.339607] RDX: 0000000000000001 RSI: ffffffffa6a118b1 RDI: ffffb6ad46e07c00
[ 2807.339608] RBP: ffffb6ad46e07c00 R08: 0000000000000000 R09: 0000000000000000
[ 2807.339609] R10: 0000000000000000 R11: 0000000000000001 R12: 0000000000000000
[ 2807.339610] R13: ffff9801ca24bb00 R14: ffff9801ca24bb00 R15: 0000000000000000
[ 2807.339611] FS: 00007f57445b0600(0000) GS:ffff981198e00000(0000)
knlGS:0000000000000000
[ 2807.339613] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 2807.339614] CR2: 00007f574367f000 CR3: 00000001236ae000 CR4: 0000000000750ee0
[ 2807.339615] PKRU: 55555554
[ 2807.339616] Call Trace:
[ 2807.339618] <TASK>
[ 2807.339621] drm_mode_atomic_ioctl+0x3b9/0xac0
[ 2807.339627] ? drm_atomic_set_property+0xb60/0xb60
[ 2807.339629] drm_ioctl_kernel+0xac/0x160
[ 2807.339633] drm_ioctl+0x22d/0x410
[ 2807.339635] ? drm_atomic_set_property+0xb60/0xb60
[ 2807.339639] amdgpu_drm_ioctl+0x4a/0x80 [amdgpu]
[ 2807.339834] __x64_sys_ioctl+0x90/0xd0
[ 2807.339838] do_syscall_64+0x5b/0x80
[ 2807.339843] ? rcu_read_lock_sched_held+0x10/0x80
[ 2807.339846] ? trace_hardirqs_on_prepare+0x55/0xe0
[ 2807.339849] ? do_syscall_64+0x67/0x80
[ 2807.339851] ? rcu_read_lock_sched_held+0x10/0x80
[ 2807.339853] ? trace_hardirqs_on_prepare+0x55/0xe0
[ 2807.339855] ? do_syscall_64+0x67/0x80
[ 2807.339857] ? do_syscall_64+0x67/0x80
[ 2807.339859] ? rcu_read_lock_sched_held+0x10/0x80
[ 2807.339861] ? trace_hardirqs_on_prepare+0x55/0xe0
[ 2807.339863] ? do_syscall_64+0x67/0x80
[ 2807.339864] ? do_syscall_64+0x67/0x80
[ 2807.339867] entry_SYSCALL_64_after_hwframe+0x63/0xcd
[ 2807.339870] RIP: 0033:0x7f5749e8d04f
[ 2807.339873] 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 <89> c2 3d 00 f0 ff ff 77 18 48 8b 44 24 18 64 48 2b 04 25 28
00 00
[ 2807.339875] RSP: 002b:00007ffecf4c6460 EFLAGS: 00000246 ORIG_RAX:
0000000000000010
[ 2807.339877] RAX: ffffffffffffffda RBX: 000055c222fb32f0 RCX: 00007f5749e8d04f
[ 2807.339878] RDX: 00007ffecf4c6500 RSI: 00000000c03864bc RDI: 000000000000000e
[ 2807.339880] RBP: 00007ffecf4c6500 R08: 0000000000000000 R09: 0000000000000000
[ 2807.339881] R10: 000055c21e4b9010 R11: 0000000000000246 R12: 00000000c03864bc
[ 2807.339882] R13: 000000000000000e R14: 000055c222e317e0 R15: 000055c21f0a4080
[ 2807.339887] </TASK>
[ 2807.339889] irq event stamp: 171599
[ 2807.339890] hardirqs last enabled at (171599):
[<ffffffffa7000b62>] asm_exc_page_fault+0x22/0x30
[ 2807.339893] hardirqs last disabled at (171598):
[<ffffffffa6f3bd81>] exc_page_fault+0x121/0x2b0
[ 2807.339896] softirqs last enabled at (171482):
[<ffffffffa60ffe4d>] __irq_exit_rcu+0xed/0x160
[ 2807.339900] softirqs last disabled at (171371):
[<ffffffffa60ffe4d>] __irq_exit_rcu+0xed/0x160
[ 2807.339903] ---[ end trace 0000000000000000 ]---
bisect points to this commit: b261509952bc19d1012cf732f853659be6ebc61e.
b261509952bc19d1012cf732f853659be6ebc61e is the first bad commit
commit b261509952bc19d1012cf732f853659be6ebc61e
Author: Leo Li <[email protected]>
Date: Tue Aug 30 16:38:16 2022 -0400
drm/amd/display: Fix double cursor on non-video RGB MPO
[Why]
DC makes use of layer_index (zpos) when picking the HW plane to enable
HW cursor on. However, some compositors will not attach zpos information
to each DRM plane. Consequently, in amdgpu, we default layer_index to 0
and do not update it.
This causes said DC logic to enable HW cursor on all planes of the same
layer_index, which manifests as a double cursor issue if one of the
planes is scaled (and hence scaling the cursor as well).
[How]
Use DRM core helpers to calculate a normalized_zpos value for each
drm_plane_state under each crtc, within the atomic state.
This helper will first consider existing zpos values, and if
identical/unset, fallback to plane ID ordering.
The normalized_zpos is then passed to dc_plane_info during atomic check
for later use by the cursor logic.
Reviewed-by: Bhawanpreet Lakha <[email protected]>
Acked-by: Wayne Lin <[email protected]>
Signed-off-by: Leo Li <[email protected]>
Tested-by: Daniel Wheeler <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
After reverting this commit the WARNING messages described here disappeared.
Thanks.
--
Best Regards,
Mike Gavrilov.
On Thu, Oct 13, 2022 at 6:36 PM Mikhail Gavrilov
<[email protected]> wrote:
>
> Hi!
> I bisected an issue of the 6.0 kernel which started happening after
> 6.0-rc7 on all my machines.
>
> Backtrace of this issue looks like as:
>
> [ 2807.339439] ------------[ cut here ]------------
> [ 2807.339445] WARNING: CPU: 11 PID: 2061 at
> drivers/gpu/drm/drm_modeset_lock.c:276
> drm_modeset_drop_locks+0x63/0x70
>
> bisect points to this commit: b261509952bc19d1012cf732f853659be6ebc61e.
>
> After reverting this commit the WARNING messages described here disappeared.
>
Hi Harry, Christian says that you can help with it.
Thanks.
--
Best Regards,
Mike Gavrilov.
Harry, please don't ignore me.
This issue still happens in 6.1 and 6.2
Leo you are the author of the problematic commit please don't stand aside.
Really nobody is interested in clean logs without warnings and errors?
I am 100% sure that reverting commit
b261509952bc19d1012cf732f853659be6ebc61e will stop these warnings. I
also attached fresh logs from 6.2.0-0.rc6.
6.2-rc7 I started to build without commit
b261509952bc19d1012cf732f853659be6ebc61e to avoid these warnings.
On Thu, Oct 13, 2022 at 6:36 PM Mikhail Gavrilov
>
> Hi!
> I bisected an issue of the 6.0 kernel which started happening after
> 6.0-rc7 on all my machines.
>
> Backtrace of this issue looks like as:
>
> [ 2807.339439] ------------[ cut here ]------------
> [ 2807.339445] WARNING: CPU: 11 PID: 2061 at
> drivers/gpu/drm/drm_modeset_lock.c:276
> drm_modeset_drop_locks+0x63/0x70
> [ 2807.339453] Modules linked in: tls uinput rfcomm snd_seq_dummy
> snd_hrtimer nft_objref nf_conntrack_netbios_ns nf_conntrack_broadcast
> nft_fib_inet nft_fib_ipv4 nft_fib_ipv6 nft_fib nft_reject_inet
> nf_reject_ipv4 nf_reject_ipv6 nft_reject nft_ct nft_chain_nat nf_nat
> nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 ip_set nf_tables nfnetlink
> qrtr bnep intel_rapl_msr intel_rapl_common snd_sof_amd_renoir
> snd_sof_amd_acp snd_sof_pci snd_hda_codec_realtek sunrpc snd_sof
> snd_hda_codec_hdmi snd_hda_codec_generic snd_sof_utils snd_hda_intel
> snd_intel_dspcfg mt7921e snd_intel_sdw_acpi binfmt_misc snd_soc_core
> mt7921_common snd_hda_codec snd_compress vfat ac97_bus edac_mce_amd
> mt76_connac_lib snd_pcm_dmaengine fat snd_hda_core snd_rpl_pci_acp6x
> snd_pci_acp6x mt76 btusb snd_hwdep kvm_amd btrtl snd_seq btbcm
> mac80211 snd_seq_device kvm btintel btmtk libarc4 snd_pcm
> snd_pci_acp5x bluetooth snd_timer snd_rn_pci_acp3x irqbypass
> snd_acp_config snd_soc_acpi cfg80211 rapl snd joydev pcspkr
> asus_nb_wmi wmi_bmof
> [ 2807.339519] snd_pci_acp3x soundcore i2c_piix4 k10temp amd_pmc
> asus_wireless zram amdgpu drm_ttm_helper ttm hid_asus asus_wmi
> crct10dif_pclmul iommu_v2 crc32_pclmul ledtrig_audio crc32c_intel
> gpu_sched sparse_keymap platform_profile hid_multitouch
> polyval_clmulni nvme ucsi_acpi drm_buddy polyval_generic
> drm_display_helper ghash_clmulni_intel serio_raw nvme_core ccp
> typec_ucsi rfkill sp5100_tco r8169 cec nvme_common typec wmi video
> i2c_hid_acpi i2c_hid ip6_tables ip_tables fuse
> [ 2807.339540] Unloaded tainted modules: acpi_cpufreq():1
> acpi_cpufreq():1 acpi_cpufreq():1 acpi_cpufreq():1 acpi_cpufreq():1
> acpi_cpufreq():1 acpi_cpufreq():1 acpi_cpufreq():1 acpi_cpufreq():1
> amd64_edac():1 acpi_cpufreq():1 acpi_cpufreq():1 amd64_edac():1
> amd64_edac():1 acpi_cpufreq():1 pcc_cpufreq():1 fjes():1
> amd64_edac():1 acpi_cpufreq():1 amd64_edac():1 acpi_cpufreq():1
> fjes():1 pcc_cpufreq():1 amd64_edac():1 acpi_cpufreq():1 fjes():1
> amd64_edac():1 acpi_cpufreq():1 pcc_cpufreq():1 amd64_edac():1
> fjes():1 acpi_cpufreq():1 acpi_cpufreq():1 pcc_cpufreq():1
> amd64_edac():1 fjes():1 acpi_cpufreq():1 amd64_edac():1
> pcc_cpufreq():1 acpi_cpufreq():1 fjes():1 amd64_edac():1
> pcc_cpufreq():1 pcc_cpufreq():1 amd64_edac():1 acpi_cpufreq():1
> fjes():1 pcc_cpufreq():1 amd64_edac():1 acpi_cpufreq():1
> acpi_cpufreq():1 amd64_edac():1 pcc_cpufreq():1 fjes():1
> acpi_cpufreq():1 amd64_edac():1 pcc_cpufreq():1 amd64_edac():1
> acpi_cpufreq():1 fjes():1 pcc_cpufreq():1 acpi_cpufreq():1
> pcc_cpufreq():1 fjes():1
> [ 2807.339579] acpi_cpufreq():1 fjes():1 pcc_cpufreq():1
> acpi_cpufreq():1 pcc_cpufreq():1 acpi_cpufreq():1 fjes():1
> acpi_cpufreq():1 pcc_cpufreq():1 fjes():1 pcc_cpufreq():1
> acpi_cpufreq():1 fjes():1 acpi_cpufreq():1 fjes():1 fjes():1 fjes():1
> fjes():1 fjes():1 fjes():1 fjes():1 fjes():1 fjes():1 fjes():1
> fjes():1 fjes():1 fjes():1 fjes():1
> [ 2807.339596] CPU: 11 PID: 2061 Comm: gnome-shell Tainted: G W
> L 6.0.0-rc4-07-cb0eca01ad9756e853efec3301203c2b5b45aa9f+ #16
> [ 2807.339598] Hardware name: ASUSTeK COMPUTER INC. ROG Strix
> G513QY_G513QY/G513QY, BIOS G513QY.318 03/29/2022
> [ 2807.339600] RIP: 0010:drm_modeset_drop_locks+0x63/0x70
> [ 2807.339602] Code: 42 08 48 89 10 48 89 1b 48 8d bb 50 ff ff ff 48
> 89 5b 08 e8 3f 41 55 00 48 8b 45 78 49 39 c4 75 c6 5b 5d 41 5c c3 cc
> cc cc cc <0f> 0b eb ac 66 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 41 55
> 41 54
> [ 2807.339604] RSP: 0018:ffffb6ad46e07b80 EFLAGS: 00010282
> [ 2807.339606] RAX: 0000000000000001 RBX: 0000000000000000 RCX: 0000000000000002
> [ 2807.339607] RDX: 0000000000000001 RSI: ffffffffa6a118b1 RDI: ffffb6ad46e07c00
> [ 2807.339608] RBP: ffffb6ad46e07c00 R08: 0000000000000000 R09: 0000000000000000
> [ 2807.339609] R10: 0000000000000000 R11: 0000000000000001 R12: 0000000000000000
> [ 2807.339610] R13: ffff9801ca24bb00 R14: ffff9801ca24bb00 R15: 0000000000000000
> [ 2807.339611] FS: 00007f57445b0600(0000) GS:ffff981198e00000(0000)
> knlGS:0000000000000000
> [ 2807.339613] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> [ 2807.339614] CR2: 00007f574367f000 CR3: 00000001236ae000 CR4: 0000000000750ee0
> [ 2807.339615] PKRU: 55555554
> [ 2807.339616] Call Trace:
> [ 2807.339618] <TASK>
> [ 2807.339621] drm_mode_atomic_ioctl+0x3b9/0xac0
> [ 2807.339627] ? drm_atomic_set_property+0xb60/0xb60
> [ 2807.339629] drm_ioctl_kernel+0xac/0x160
> [ 2807.339633] drm_ioctl+0x22d/0x410
> [ 2807.339635] ? drm_atomic_set_property+0xb60/0xb60
> [ 2807.339639] amdgpu_drm_ioctl+0x4a/0x80 [amdgpu]
> [ 2807.339834] __x64_sys_ioctl+0x90/0xd0
> [ 2807.339838] do_syscall_64+0x5b/0x80
> [ 2807.339843] ? rcu_read_lock_sched_held+0x10/0x80
> [ 2807.339846] ? trace_hardirqs_on_prepare+0x55/0xe0
> [ 2807.339849] ? do_syscall_64+0x67/0x80
> [ 2807.339851] ? rcu_read_lock_sched_held+0x10/0x80
> [ 2807.339853] ? trace_hardirqs_on_prepare+0x55/0xe0
> [ 2807.339855] ? do_syscall_64+0x67/0x80
> [ 2807.339857] ? do_syscall_64+0x67/0x80
> [ 2807.339859] ? rcu_read_lock_sched_held+0x10/0x80
> [ 2807.339861] ? trace_hardirqs_on_prepare+0x55/0xe0
> [ 2807.339863] ? do_syscall_64+0x67/0x80
> [ 2807.339864] ? do_syscall_64+0x67/0x80
> [ 2807.339867] entry_SYSCALL_64_after_hwframe+0x63/0xcd
> [ 2807.339870] RIP: 0033:0x7f5749e8d04f
> [ 2807.339873] 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 <89> c2 3d 00 f0 ff ff 77 18 48 8b 44 24 18 64 48 2b 04 25 28
> 00 00
> [ 2807.339875] RSP: 002b:00007ffecf4c6460 EFLAGS: 00000246 ORIG_RAX:
> 0000000000000010
> [ 2807.339877] RAX: ffffffffffffffda RBX: 000055c222fb32f0 RCX: 00007f5749e8d04f
> [ 2807.339878] RDX: 00007ffecf4c6500 RSI: 00000000c03864bc RDI: 000000000000000e
> [ 2807.339880] RBP: 00007ffecf4c6500 R08: 0000000000000000 R09: 0000000000000000
> [ 2807.339881] R10: 000055c21e4b9010 R11: 0000000000000246 R12: 00000000c03864bc
> [ 2807.339882] R13: 000000000000000e R14: 000055c222e317e0 R15: 000055c21f0a4080
> [ 2807.339887] </TASK>
> [ 2807.339889] irq event stamp: 171599
> [ 2807.339890] hardirqs last enabled at (171599):
> [<ffffffffa7000b62>] asm_exc_page_fault+0x22/0x30
> [ 2807.339893] hardirqs last disabled at (171598):
> [<ffffffffa6f3bd81>] exc_page_fault+0x121/0x2b0
> [ 2807.339896] softirqs last enabled at (171482):
> [<ffffffffa60ffe4d>] __irq_exit_rcu+0xed/0x160
> [ 2807.339900] softirqs last disabled at (171371):
> [<ffffffffa60ffe4d>] __irq_exit_rcu+0xed/0x160
> [ 2807.339903] ---[ end trace 0000000000000000 ]---
>
> bisect points to this commit: b261509952bc19d1012cf732f853659be6ebc61e.
>
> b261509952bc19d1012cf732f853659be6ebc61e is the first bad commit
> commit b261509952bc19d1012cf732f853659be6ebc61e
> Author: Leo Li <[email protected]>
> Date: Tue Aug 30 16:38:16 2022 -0400
>
> drm/amd/display: Fix double cursor on non-video RGB MPO
>
> [Why]
>
> DC makes use of layer_index (zpos) when picking the HW plane to enable
> HW cursor on. However, some compositors will not attach zpos information
> to each DRM plane. Consequently, in amdgpu, we default layer_index to 0
> and do not update it.
>
> This causes said DC logic to enable HW cursor on all planes of the same
> layer_index, which manifests as a double cursor issue if one of the
> planes is scaled (and hence scaling the cursor as well).
>
> [How]
>
> Use DRM core helpers to calculate a normalized_zpos value for each
> drm_plane_state under each crtc, within the atomic state.
>
> This helper will first consider existing zpos values, and if
> identical/unset, fallback to plane ID ordering.
>
> The normalized_zpos is then passed to dc_plane_info during atomic check
> for later use by the cursor logic.
>
> Reviewed-by: Bhawanpreet Lakha <[email protected]>
> Acked-by: Wayne Lin <[email protected]>
> Signed-off-by: Leo Li <[email protected]>
> Tested-by: Daniel Wheeler <[email protected]>
> Signed-off-by: Alex Deucher <[email protected]>
>
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> After reverting this commit the WARNING messages described here disappeared.
>
> Thanks.
>
> --
> Best Regards,
> Mike Gavrilov.
--
Best Regards,
Mike Gavrilov.
Hi Mikhail, seems like your report flew past me, thanks for the ping.
This might be a simple issue of not backing off when deadlock was hit.
drm_atomic_normalize_zpos() can return an error code, and I ignored it
(oops!)
Can you give this patch a try?
https://gitlab.freedesktop.org/-/snippets/7414
- Leo
On 2/9/23 04:27, Mikhail Gavrilov wrote:
> Harry, please don't ignore me.
> This issue still happens in 6.1 and 6.2
> Leo you are the author of the problematic commit please don't stand aside.
> Really nobody is interested in clean logs without warnings and errors?
> I am 100% sure that reverting commit
> b261509952bc19d1012cf732f853659be6ebc61e will stop these warnings. I
> also attached fresh logs from 6.2.0-0.rc6.
> 6.2-rc7 I started to build without commit
> b261509952bc19d1012cf732f853659be6ebc61e to avoid these warnings.
>
>
> On Thu, Oct 13, 2022 at 6:36 PM Mikhail Gavrilov
>>
>> Hi!
>> I bisected an issue of the 6.0 kernel which started happening after
>> 6.0-rc7 on all my machines.
>>
>> Backtrace of this issue looks like as:
>>
>> [ 2807.339439] ------------[ cut here ]------------
>> [ 2807.339445] WARNING: CPU: 11 PID: 2061 at
>> drivers/gpu/drm/drm_modeset_lock.c:276
>> drm_modeset_drop_locks+0x63/0x70
>> [ 2807.339453] Modules linked in: tls uinput rfcomm snd_seq_dummy
>> snd_hrtimer nft_objref nf_conntrack_netbios_ns nf_conntrack_broadcast
>> nft_fib_inet nft_fib_ipv4 nft_fib_ipv6 nft_fib nft_reject_inet
>> nf_reject_ipv4 nf_reject_ipv6 nft_reject nft_ct nft_chain_nat nf_nat
>> nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 ip_set nf_tables nfnetlink
>> qrtr bnep intel_rapl_msr intel_rapl_common snd_sof_amd_renoir
>> snd_sof_amd_acp snd_sof_pci snd_hda_codec_realtek sunrpc snd_sof
>> snd_hda_codec_hdmi snd_hda_codec_generic snd_sof_utils snd_hda_intel
>> snd_intel_dspcfg mt7921e snd_intel_sdw_acpi binfmt_misc snd_soc_core
>> mt7921_common snd_hda_codec snd_compress vfat ac97_bus edac_mce_amd
>> mt76_connac_lib snd_pcm_dmaengine fat snd_hda_core snd_rpl_pci_acp6x
>> snd_pci_acp6x mt76 btusb snd_hwdep kvm_amd btrtl snd_seq btbcm
>> mac80211 snd_seq_device kvm btintel btmtk libarc4 snd_pcm
>> snd_pci_acp5x bluetooth snd_timer snd_rn_pci_acp3x irqbypass
>> snd_acp_config snd_soc_acpi cfg80211 rapl snd joydev pcspkr
>> asus_nb_wmi wmi_bmof
>> [ 2807.339519] snd_pci_acp3x soundcore i2c_piix4 k10temp amd_pmc
>> asus_wireless zram amdgpu drm_ttm_helper ttm hid_asus asus_wmi
>> crct10dif_pclmul iommu_v2 crc32_pclmul ledtrig_audio crc32c_intel
>> gpu_sched sparse_keymap platform_profile hid_multitouch
>> polyval_clmulni nvme ucsi_acpi drm_buddy polyval_generic
>> drm_display_helper ghash_clmulni_intel serio_raw nvme_core ccp
>> typec_ucsi rfkill sp5100_tco r8169 cec nvme_common typec wmi video
>> i2c_hid_acpi i2c_hid ip6_tables ip_tables fuse
>> [ 2807.339540] Unloaded tainted modules: acpi_cpufreq():1
>> acpi_cpufreq():1 acpi_cpufreq():1 acpi_cpufreq():1 acpi_cpufreq():1
>> acpi_cpufreq():1 acpi_cpufreq():1 acpi_cpufreq():1 acpi_cpufreq():1
>> amd64_edac():1 acpi_cpufreq():1 acpi_cpufreq():1 amd64_edac():1
>> amd64_edac():1 acpi_cpufreq():1 pcc_cpufreq():1 fjes():1
>> amd64_edac():1 acpi_cpufreq():1 amd64_edac():1 acpi_cpufreq():1
>> fjes():1 pcc_cpufreq():1 amd64_edac():1 acpi_cpufreq():1 fjes():1
>> amd64_edac():1 acpi_cpufreq():1 pcc_cpufreq():1 amd64_edac():1
>> fjes():1 acpi_cpufreq():1 acpi_cpufreq():1 pcc_cpufreq():1
>> amd64_edac():1 fjes():1 acpi_cpufreq():1 amd64_edac():1
>> pcc_cpufreq():1 acpi_cpufreq():1 fjes():1 amd64_edac():1
>> pcc_cpufreq():1 pcc_cpufreq():1 amd64_edac():1 acpi_cpufreq():1
>> fjes():1 pcc_cpufreq():1 amd64_edac():1 acpi_cpufreq():1
>> acpi_cpufreq():1 amd64_edac():1 pcc_cpufreq():1 fjes():1
>> acpi_cpufreq():1 amd64_edac():1 pcc_cpufreq():1 amd64_edac():1
>> acpi_cpufreq():1 fjes():1 pcc_cpufreq():1 acpi_cpufreq():1
>> pcc_cpufreq():1 fjes():1
>> [ 2807.339579] acpi_cpufreq():1 fjes():1 pcc_cpufreq():1
>> acpi_cpufreq():1 pcc_cpufreq():1 acpi_cpufreq():1 fjes():1
>> acpi_cpufreq():1 pcc_cpufreq():1 fjes():1 pcc_cpufreq():1
>> acpi_cpufreq():1 fjes():1 acpi_cpufreq():1 fjes():1 fjes():1 fjes():1
>> fjes():1 fjes():1 fjes():1 fjes():1 fjes():1 fjes():1 fjes():1
>> fjes():1 fjes():1 fjes():1 fjes():1
>> [ 2807.339596] CPU: 11 PID: 2061 Comm: gnome-shell Tainted: G W
>> L 6.0.0-rc4-07-cb0eca01ad9756e853efec3301203c2b5b45aa9f+ #16
>> [ 2807.339598] Hardware name: ASUSTeK COMPUTER INC. ROG Strix
>> G513QY_G513QY/G513QY, BIOS G513QY.318 03/29/2022
>> [ 2807.339600] RIP: 0010:drm_modeset_drop_locks+0x63/0x70
>> [ 2807.339602] Code: 42 08 48 89 10 48 89 1b 48 8d bb 50 ff ff ff 48
>> 89 5b 08 e8 3f 41 55 00 48 8b 45 78 49 39 c4 75 c6 5b 5d 41 5c c3 cc
>> cc cc cc <0f> 0b eb ac 66 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 41 55
>> 41 54
>> [ 2807.339604] RSP: 0018:ffffb6ad46e07b80 EFLAGS: 00010282
>> [ 2807.339606] RAX: 0000000000000001 RBX: 0000000000000000 RCX: 0000000000000002
>> [ 2807.339607] RDX: 0000000000000001 RSI: ffffffffa6a118b1 RDI: ffffb6ad46e07c00
>> [ 2807.339608] RBP: ffffb6ad46e07c00 R08: 0000000000000000 R09: 0000000000000000
>> [ 2807.339609] R10: 0000000000000000 R11: 0000000000000001 R12: 0000000000000000
>> [ 2807.339610] R13: ffff9801ca24bb00 R14: ffff9801ca24bb00 R15: 0000000000000000
>> [ 2807.339611] FS: 00007f57445b0600(0000) GS:ffff981198e00000(0000)
>> knlGS:0000000000000000
>> [ 2807.339613] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
>> [ 2807.339614] CR2: 00007f574367f000 CR3: 00000001236ae000 CR4: 0000000000750ee0
>> [ 2807.339615] PKRU: 55555554
>> [ 2807.339616] Call Trace:
>> [ 2807.339618] <TASK>
>> [ 2807.339621] drm_mode_atomic_ioctl+0x3b9/0xac0
>> [ 2807.339627] ? drm_atomic_set_property+0xb60/0xb60
>> [ 2807.339629] drm_ioctl_kernel+0xac/0x160
>> [ 2807.339633] drm_ioctl+0x22d/0x410
>> [ 2807.339635] ? drm_atomic_set_property+0xb60/0xb60
>> [ 2807.339639] amdgpu_drm_ioctl+0x4a/0x80 [amdgpu]
>> [ 2807.339834] __x64_sys_ioctl+0x90/0xd0
>> [ 2807.339838] do_syscall_64+0x5b/0x80
>> [ 2807.339843] ? rcu_read_lock_sched_held+0x10/0x80
>> [ 2807.339846] ? trace_hardirqs_on_prepare+0x55/0xe0
>> [ 2807.339849] ? do_syscall_64+0x67/0x80
>> [ 2807.339851] ? rcu_read_lock_sched_held+0x10/0x80
>> [ 2807.339853] ? trace_hardirqs_on_prepare+0x55/0xe0
>> [ 2807.339855] ? do_syscall_64+0x67/0x80
>> [ 2807.339857] ? do_syscall_64+0x67/0x80
>> [ 2807.339859] ? rcu_read_lock_sched_held+0x10/0x80
>> [ 2807.339861] ? trace_hardirqs_on_prepare+0x55/0xe0
>> [ 2807.339863] ? do_syscall_64+0x67/0x80
>> [ 2807.339864] ? do_syscall_64+0x67/0x80
>> [ 2807.339867] entry_SYSCALL_64_after_hwframe+0x63/0xcd
>> [ 2807.339870] RIP: 0033:0x7f5749e8d04f
>> [ 2807.339873] 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 <89> c2 3d 00 f0 ff ff 77 18 48 8b 44 24 18 64 48 2b 04 25 28
>> 00 00
>> [ 2807.339875] RSP: 002b:00007ffecf4c6460 EFLAGS: 00000246 ORIG_RAX:
>> 0000000000000010
>> [ 2807.339877] RAX: ffffffffffffffda RBX: 000055c222fb32f0 RCX: 00007f5749e8d04f
>> [ 2807.339878] RDX: 00007ffecf4c6500 RSI: 00000000c03864bc RDI: 000000000000000e
>> [ 2807.339880] RBP: 00007ffecf4c6500 R08: 0000000000000000 R09: 0000000000000000
>> [ 2807.339881] R10: 000055c21e4b9010 R11: 0000000000000246 R12: 00000000c03864bc
>> [ 2807.339882] R13: 000000000000000e R14: 000055c222e317e0 R15: 000055c21f0a4080
>> [ 2807.339887] </TASK>
>> [ 2807.339889] irq event stamp: 171599
>> [ 2807.339890] hardirqs last enabled at (171599):
>> [<ffffffffa7000b62>] asm_exc_page_fault+0x22/0x30
>> [ 2807.339893] hardirqs last disabled at (171598):
>> [<ffffffffa6f3bd81>] exc_page_fault+0x121/0x2b0
>> [ 2807.339896] softirqs last enabled at (171482):
>> [<ffffffffa60ffe4d>] __irq_exit_rcu+0xed/0x160
>> [ 2807.339900] softirqs last disabled at (171371):
>> [<ffffffffa60ffe4d>] __irq_exit_rcu+0xed/0x160
>> [ 2807.339903] ---[ end trace 0000000000000000 ]---
>>
>> bisect points to this commit: b261509952bc19d1012cf732f853659be6ebc61e.
>>
>> b261509952bc19d1012cf732f853659be6ebc61e is the first bad commit
>> commit b261509952bc19d1012cf732f853659be6ebc61e
>> Author: Leo Li <[email protected]>
>> Date: Tue Aug 30 16:38:16 2022 -0400
>>
>> drm/amd/display: Fix double cursor on non-video RGB MPO
>>
>> [Why]
>>
>> DC makes use of layer_index (zpos) when picking the HW plane to enable
>> HW cursor on. However, some compositors will not attach zpos information
>> to each DRM plane. Consequently, in amdgpu, we default layer_index to 0
>> and do not update it.
>>
>> This causes said DC logic to enable HW cursor on all planes of the same
>> layer_index, which manifests as a double cursor issue if one of the
>> planes is scaled (and hence scaling the cursor as well).
>>
>> [How]
>>
>> Use DRM core helpers to calculate a normalized_zpos value for each
>> drm_plane_state under each crtc, within the atomic state.
>>
>> This helper will first consider existing zpos values, and if
>> identical/unset, fallback to plane ID ordering.
>>
>> The normalized_zpos is then passed to dc_plane_info during atomic check
>> for later use by the cursor logic.
>>
>> Reviewed-by: Bhawanpreet Lakha <[email protected]>
>> Acked-by: Wayne Lin <[email protected]>
>> Signed-off-by: Leo Li <[email protected]>
>> Tested-by: Daniel Wheeler <[email protected]>
>> Signed-off-by: Alex Deucher <[email protected]>
>>
>> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 12 ++++++++++--
>> 1 file changed, 10 insertions(+), 2 deletions(-)
>>
>> After reverting this commit the WARNING messages described here disappeared.
>>
>> Thanks.
>>
>> --
>> Best Regards,
>> Mike Gavrilov.
>
>
>
On Thu, Feb 9, 2023 at 10:17 PM Leo Li <[email protected]> wrote:
>
> Hi Mikhail, seems like your report flew past me, thanks for the ping.
>
> This might be a simple issue of not backing off when deadlock was hit.
> drm_atomic_normalize_zpos() can return an error code, and I ignored it
> (oops!)
>
> Can you give this patch a try?
> https://gitlab.freedesktop.org/-/snippets/7414
>
> - Leo
>
Thanks,
I think the time for testing was enough.
I observed three computers with different GPUs 6800M, 6900XT and
7900XTX for more than 3 days. And a warning message about
drm_modeset_drop_locks no longer appears anymore.
I hope this patch will have time to be merged in 6.2 before release.
Tested-by: Mikhail Gavrilov <[email protected]>
--
Best Regards,
Mike Gavrilov.