[AMD Official Use Only - General] Thanks for sorting out this, that is making sense since driver already skip kfd device suspend and this will skip kfd_iommu_suspend() as well.
Reviewed-by: Prike Liang <[email protected]> Regards, --Prike > -----Original Message----- > From: Limonciello, Mario <[email protected]> > Sent: Thursday, April 13, 2023 9:25 AM > To: Liu, Aaron <[email protected]>; [email protected] > Cc: Deucher, Alexander <[email protected]>; Kuehling, Felix > <[email protected]>; Liang, Prike <[email protected]> > Subject: Re: drm/amdgpu: skip kfd-iommu suspend/resume for S0ix > > On 4/5/2023 06:29, Aaron Liu 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 <[email protected]> > > Acked-by: Alex Deucher <[email protected]> > Reviewed-by: Mario Limonciello <[email protected]> > > --- > > 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)
