]> git.itanic.dy.fi Git - linux-stable/commit
drm/amdgpu: handle the case of pci_channel_io_frozen only in amdgpu_pci_resume
authorGuchun Chen <guchun.chen@amd.com>
Fri, 1 Oct 2021 01:48:50 +0000 (09:48 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 5 Oct 2021 17:02:31 +0000 (13:02 -0400)
commit248b061689a40f4fed05252ee2c89f87cf26d7d8
tree12d0fda010a77bfe5613a25ca58b552f3432820d
parent714d9e4574d54596973ee3b0624ee4a16264d700
drm/amdgpu: handle the case of pci_channel_io_frozen only in amdgpu_pci_resume

In current code, when a PCI error state pci_channel_io_normal is detectd,
it will report PCI_ERS_RESULT_CAN_RECOVER status to PCI driver, and PCI
driver will continue the execution of PCI resume callback report_resume by
pci_walk_bridge, and the callback will go into amdgpu_pci_resume
finally, where write lock is releasd unconditionally without acquiring
such lock first. In this case, a deadlock will happen when other threads
start to acquire the read lock.

To fix this, add a member in amdgpu_device strucutre to cache
pci_channel_state, and only continue the execution in amdgpu_pci_resume
when it's pci_channel_io_frozen.

Fixes: c9a6b82f45e2 ("drm/amdgpu: Implement DPC recovery")
Suggested-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: Guchun Chen <guchun.chen@amd.com>
Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu.h
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c