Commit c99a2e7a authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdkfd: drop IOMMUv2 support 



Now that we use the dGPU path for all APUs, drop the
IOMMUv2 support.

v2: drop the now unused queue manager functions for gfx7/8 APUs

Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Tested-by: default avatarMike Lothian <mike@fireburn.co.uk>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2b4adeb3

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

+0 −10
Original line number Diff line number Diff line
@@ -226,16 +226,6 @@ void amdgpu_amdkfd_suspend(struct amdgpu_device *adev, bool run_pm) 
		kgd2kfd_suspend(adev->kfd.dev, run_pm);

}



int amdgpu_amdkfd_resume_iommu(struct amdgpu_device *adev)

{

	int r = 0;



	if (adev->kfd.dev)

		r = kgd2kfd_resume_iommu(adev->kfd.dev);



	return r;

}



int amdgpu_amdkfd_resume(struct amdgpu_device *adev, bool run_pm)

{

	int r = 0;

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

+0 −7
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ int amdgpu_amdkfd_init(void); 
void amdgpu_amdkfd_fini(void);



void amdgpu_amdkfd_suspend(struct amdgpu_device *adev, bool run_pm);

int amdgpu_amdkfd_resume_iommu(struct amdgpu_device *adev);

int amdgpu_amdkfd_resume(struct amdgpu_device *adev, bool run_pm);

void amdgpu_amdkfd_interrupt(struct amdgpu_device *adev,

			const void *ih_ring_entry);
@@ -399,7 +398,6 @@ 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);
@@ -439,11 +437,6 @@ 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/amdgpu/amdgpu_device.c

+0 −9
Original line number Diff line number Diff line
@@ -3236,12 +3236,6 @@ static int amdgpu_device_ip_resume(struct amdgpu_device *adev) 
{

	int r;



	if (!adev->in_s0ix) {

		r = amdgpu_amdkfd_resume_iommu(adev);

		if (r)

			return r;

	}



	r = amdgpu_device_ip_resume_phase1(adev);

	if (r)

		return r;
@@ -4946,9 +4940,6 @@ 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)

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

+0 −14
Original line number Diff line number Diff line
@@ -755,20 +755,6 @@ module_param(debug_largebar, int, 0444); 
MODULE_PARM_DESC(debug_largebar,

	"Debug large-bar flag used to simulate large-bar capability on non-large bar machine (0 = disable, 1 = enable)");



/**

 * DOC: ignore_crat (int)

 * Ignore CRAT table during KFD initialization. By default, KFD uses the ACPI CRAT

 * table to get information about AMD APUs. This option can serve as a workaround on

 * systems with a broken CRAT table.

 *

 * Default is auto (according to asic type, iommu_v2, and crat table, to decide

 * whether use CRAT)

 */

int ignore_crat;

module_param(ignore_crat, int, 0444);

MODULE_PARM_DESC(ignore_crat,

	"Ignore CRAT table during KFD initialization (0 = auto (default), 1 = ignore CRAT)");



/**

 * DOC: halt_if_hws_hang (int)

 * Halt if HWS hang is detected. Default value, 0, disables the halt on hang.

drivers/gpu/drm/amd/amdkfd/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
config HSA_AMD

	bool "HSA kernel driver for AMD GPU devices"

	depends on DRM_AMDGPU && (X86_64 || ARM64 || PPC64)

	imply AMD_IOMMU_V2 if X86_64

	select HMM_MIRROR

	select MMU_NOTIFIER

	select DRM_AMDGPU_USERPTR