Commit 3c22c1ea authored by Shikang Fan's avatar Shikang Fan Committed by Alex Deucher
Browse files

drm/amdgpu: fix for suspend/resume kiq fence fallback under sriov 



- in device_resume, sriov configure interrupt should be in full access,
  so release_full_gpu should be done after kfd_resume.
- remove the previous workaround solution for sriov.

Fixes: ec4927d4 ("drm/amdgpu: fix for suspend/resume sequence under sriov")
Signed-off-by: default avatarShikang Fan <shikang.fan@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6066aaf7

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

+12 −11
Original line number Diff line number Diff line
@@ -4181,21 +4181,15 @@ int amdgpu_device_resume(struct drm_device *dev, bool fbcon) 


	r = amdgpu_device_ip_resume(adev);



	/* no matter what r is, always need to properly release full GPU */

	if (amdgpu_sriov_vf(adev)) {

		amdgpu_virt_init_data_exchange(adev);

		amdgpu_virt_release_full_gpu(adev, true);

	}



	if (r) {

		dev_err(adev->dev, "amdgpu_device_ip_resume failed (%d).\n", r);

		return r;

		goto exit;

	}

	amdgpu_fence_driver_hw_init(adev);



	r = amdgpu_device_ip_late_init(adev);

	if (r)

		return r;

		goto exit;



	queue_delayed_work(system_wq, &adev->delayed_init_work,

			   msecs_to_jiffies(AMDGPU_RESUME_MS));
@@ -4203,12 +4197,19 @@ int amdgpu_device_resume(struct drm_device *dev, bool fbcon) 
	if (!adev->in_s0ix) {

		r = amdgpu_amdkfd_resume(adev, adev->in_runpm);

		if (r)

			return r;

			goto exit;

	}



exit:

	if (amdgpu_sriov_vf(adev)) {

		amdgpu_virt_init_data_exchange(adev);

		amdgpu_virt_release_full_gpu(adev, true);

	}



	if (r)

		return r;



	/* Make sure IB tests flushed */

	if (amdgpu_sriov_vf(adev))

		amdgpu_irq_gpu_reset_resume_helper(adev);

	flush_delayed_work(&adev->delayed_init_work);



	if (adev->in_s0ix) {