Commit f02abeb0 authored by James Zhu's avatar James Zhu Committed by Alex Deucher
Browse files

drm/amdgpu: move iommu_resume before ip init/resume 

Separate iommu_resume from kfd_resume, and move it before
other amdgpu ip init/resume.

Bug: https://bugzilla.kernel.org/show_bug.cgi?id=211277


Signed-off-by: default avatarJames Zhu <James.Zhu@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 80660084

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+12 −0
Original line number Diff line number Diff line
@@ -2394,6 +2394,10 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) 
	if (r)

		goto init_failed;



	r = amdgpu_amdkfd_resume_iommu(adev);

	if (r)

		goto init_failed;



	r = amdgpu_device_ip_hw_init_phase1(adev);

	if (r)

		goto init_failed;
@@ -3148,6 +3152,10 @@ static int amdgpu_device_ip_resume(struct amdgpu_device *adev) 
{

	int r;



	r = amdgpu_amdkfd_resume_iommu(adev);

	if (r)

		return r;



	r = amdgpu_device_ip_resume_phase1(adev);

	if (r)

		return r;
@@ -4601,6 +4609,10 @@ int amdgpu_do_asic_reset(struct list_head *device_list_handle, 
				dev_warn(tmp_adev->dev, "asic atom init failed!");

			} else {

				dev_info(tmp_adev->dev, "GPU reset succeeded, trying to resume\n");

				r = amdgpu_amdkfd_resume_iommu(tmp_adev);

				if (r)

					goto out;



				r = amdgpu_device_ip_resume_phase1(tmp_adev);

				if (r)

					goto out;