drm/amd/amdgpu: move drain_workqueue before shutdown is set
Subsystems (2)
PATCH 1/1 drm/amd/amdgpu: move drain_workqueue before shutdown is set
[background] when unloading amdgpu driver right after running a workload, drain_workqueue is causing "Fence fallback timer expired on ring sdma0.0". Under sriov, this issue will cause sriov full access timeout and a reset happening.
move drain_workqueue before shutdown is set to allow ih process and before enter full access under sriov to avoid full access time cost.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -3
@@ -4531,6 +4531,9 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) {dev_info (adev->dev,"amdgpu: finishing device.\n" );flush_delayed_work (&adev->delayed_init_work); + +if (adev->mman.initialized) +drain_workqueue (adev->mman.bdev.wq); adev->shutdown = true;/* make sure IB test finished before entering exclusive mode
@@ -4551,9 +4554,6 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) }amdgpu_fence_driver_hw_fini (adev); -if (adev->mman.initialized) -drain_workqueue (adev->mman.bdev.wq); -if (adev->pm.sysfs_initialized)amdgpu_pm_sysfs_fini (adev);if (adev->ucode_sysfs_en)
Signature · 1 line
2.34.1
[AMD Official Use Only - AMD Internal Distribution Only]
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Victor Zhao
Sent: Monday, August 26, 2024 11:52 AM
To: [email protected]
Cc: Zhao, Victor <[email protected]>
Subject: [PATCH] drm/amd/amdgpu: move drain_workqueue before shutdown is set
[background] when unloading amdgpu driver right after running a workload, drain_workqueue is causing "Fence fallback timer expired on ring sdma0.0". Under sriov, this issue will cause sriov full access timeout and a reset happening.
move drain_workqueue before shutdown is set to allow ih process and before enter full access under sriov to avoid full access time cost.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -0
@@ -4531,6 +4531,9 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) {dev_info (adev->dev,"amdgpu: finishing device.\n" );flush_delayed_work (&adev->delayed_init_work); + +if (adev->mman.initialized) +drain_workqueue (adev->mman.bdev.wq); adev->shutdown = true;/* make sure IB test finished before entering exclusive mode @@ -4551,9 +4554,6 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) }
amdgpu_fence_driver_hw_fini(adev);
- if (adev->mman.initialized)
- drain_workqueue(adev->mman.bdev.wq);
-
if (adev->pm.sysfs_initialized)
amdgpu_pm_sysfs_fini(adev);
if (adev->ucode_sysfs_en)--
2.34.1