On 4/5/2023 06:29, Liu, Aaron wrote:
GFX is in gfxoff mode during s0ix so we shouldn't need to
actually execute kfd_iommu_suspend/kfd_iommu_resume operation.

Signed-off-by: Aaron Liu <aaron....@amd.com>
---
Probably should add to this patch:

Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2449

  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 3b6b85d9e0be..5094be94fa06 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3304,9 +3304,11 @@ static int amdgpu_device_ip_resume(struct amdgpu_device 
*adev)
  {
         int r;

-       r = amdgpu_amdkfd_resume_iommu(adev);
-       if (r)
-               return r;
+       if (!adev->in_s0ix) {
+               r = amdgpu_amdkfd_resume_iommu(adev);
+               if (r)
+                       return r;
+       }

         r = amdgpu_device_ip_resume_phase1(adev);
         if (r)
--
2.39.0


Reply via email to