drm/amdgpu: Add an extra evict_resource call during device_suspend.
authorShikang Fan <shikang.fan@amd.com>
Thu, 8 Dec 2022 11:53:14 +0000 (19:53 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 13 Dec 2022 22:10:32 +0000 (17:10 -0500)
- evict_resource is taking too long causing sriov full access mode timeout.
  So, add an extra evict_resource in the beginning as an early evict.

Signed-off-by: Shikang Fan <shikang.fan@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

index cfa411c..64660a4 100644 (file)
@@ -4112,6 +4112,11 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon)
 
        adev->in_suspend = true;
 
+       /* Evict the majority of BOs before grabbing the full access */
+       r = amdgpu_device_evict_resources(adev);
+       if (r)
+               return r;
+
        if (amdgpu_sriov_vf(adev)) {
                amdgpu_virt_fini_data_exchange(adev);
                r = amdgpu_virt_request_full_gpu(adev, false);