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

drm/amdkfd: separate kfd_iommu_resume from kfd_resume 

Separate kfd_iommu_resume from kfd_resume for fine-tuning
of amdgpu device init/resume/reset/recovery sequence.

v2: squash in fix for !CONFIG_HSA_AMD

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 71ae3099

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h

+6 −0
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, 
			 const struct kgd2kfd_shared_resources *gpu_resources);

void kgd2kfd_device_exit(struct kfd_dev *kfd);

void kgd2kfd_suspend(struct kfd_dev *kfd, bool run_pm);

int kgd2kfd_resume_iommu(struct kfd_dev *kfd);

int kgd2kfd_resume(struct kfd_dev *kfd, bool run_pm);

int kgd2kfd_pre_reset(struct kfd_dev *kfd);

int kgd2kfd_post_reset(struct kfd_dev *kfd);
@@ -365,6 +366,11 @@ static inline void kgd2kfd_suspend(struct kfd_dev *kfd, bool run_pm) 
{

}



static int __maybe_unused kgd2kfd_resume_iommu(struct kfd_dev *kfd)

{

	return 0;

}



static inline int kgd2kfd_resume(struct kfd_dev *kfd, bool run_pm)

{

	return 0;

drivers/gpu/drm/amd/amdkfd/kfd_device.c

+8 −4
Original line number Diff line number Diff line
@@ -1069,18 +1069,22 @@ int kgd2kfd_resume(struct kfd_dev *kfd, bool run_pm) 
	return ret;

}



static int kfd_resume(struct kfd_dev *kfd)

int kgd2kfd_resume_iommu(struct kfd_dev *kfd)

{

	int err = 0;



	err = kfd_iommu_resume(kfd);

	if (err) {

	if (err)

		dev_err(kfd_device,

			"Failed to resume IOMMU for device %x:%x\n",

			kfd->pdev->vendor, kfd->pdev->device);

	return err;

}



static int kfd_resume(struct kfd_dev *kfd)

{

	int err = 0;



	err = kfd->dqm->ops.start(kfd->dqm);

	if (err) {

		dev_err(kfd_device,