diff options
| author | Flora Cui <flora.cui@amd.com> | 2020-09-09 13:47:42 +0800 |
|---|---|---|
| committer | Flora Cui <flora.cui@amd.com> | 2020-09-09 16:57:47 +0800 |
| commit | 91eda1fbd37ed4c1dfb869126adbb8989bef5579 (patch) | |
| tree | a0f7b0fd1d8f80ddc9c8129766e8bf9fd680c724 | |
| parent | 2ec2a0da80d7216db9e12c16ab52f3dc15189451 (diff) | |
Revert "drm/amdkcl: Test whether iommu_get_domain_for_dev() is available"
This reverts commit 6d74f1e7ed4ae8788fa8129ed997f0f7d16a5dfe.
not needed anymore
Signed-off-by: Flora Cui <flora.cui@amd.com>
| -rwxr-xr-x | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/dkms/config/config.h | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/dkms/m4/iommu-get-domain-for-dev.m4 | 16 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/dkms/m4/kernel.m4 | 1 |
4 files changed, 0 insertions, 24 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 41305f4b5a2e..868d577c5b67 100755 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -2965,7 +2965,6 @@ static const struct file_operations amdgpu_ttm_gtt_fops = { #endif -#ifdef HAVE_IOMMU_GET_DOMAIN_FOR_DEV /** * amdgpu_iomem_read - Virtual read access to GPU mapped memory * @@ -3079,7 +3078,6 @@ static const struct file_operations amdgpu_ttm_iomem_fops = { .write = amdgpu_iomem_write, .llseek = default_llseek }; -#endif /*HAVE_IOMMU_GET_DOMAIN_FOR_DEV*/ static const struct { char *name; @@ -3090,9 +3088,7 @@ static const struct { #ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS { "amdgpu_gtt", &amdgpu_ttm_gtt_fops, TTM_PL_TT }, #endif -#ifdef HAVE_IOMMU_GET_DOMAIN_FOR_DEV { "amdgpu_iomem", &amdgpu_ttm_iomem_fops, TTM_PL_SYSTEM }, -#endif }; #endif diff --git a/drivers/gpu/drm/amd/dkms/config/config.h b/drivers/gpu/drm/amd/dkms/config/config.h index 7e5ea998aa27..f10b4ad4cb52 100644 --- a/drivers/gpu/drm/amd/dkms/config/config.h +++ b/drivers/gpu/drm/amd/dkms/config/config.h @@ -602,9 +602,6 @@ /* in_compat_syscall is defined */ #define HAVE_IN_COMPAT_SYSCALL 1 -/* iommu_get_domain_for_dev() is available */ -#define HAVE_IOMMU_GET_DOMAIN_FOR_DEV 1 - /* IRQ translation domains exist */ #define HAVE_IRQ_DOMAIN 1 diff --git a/drivers/gpu/drm/amd/dkms/m4/iommu-get-domain-for-dev.m4 b/drivers/gpu/drm/amd/dkms/m4/iommu-get-domain-for-dev.m4 deleted file mode 100644 index 52db9d7c1bdc..000000000000 --- a/drivers/gpu/drm/amd/dkms/m4/iommu-get-domain-for-dev.m4 +++ /dev/null @@ -1,16 +0,0 @@ -dnl # -dnl # commit 2c1296d92ac03 -dnl # iommu: Add iommu_get_domain_for_dev function -dnl # -AC_DEFUN([AC_AMDGPU_IOMMU_GET_DOMAIN_FOR_DEV], [ - AC_KERNEL_DO_BACKGROUND([ - AC_KERNEL_TRY_COMPILE_SYMBOL([ - #include <linux/iommu.h> - ], [ - iommu_get_domain_for_dev(NULL); - ], [iommu_get_domain_for_dev],[drivers/iommu/iommu.c],[ - AC_DEFINE(HAVE_IOMMU_GET_DOMAIN_FOR_DEV, 1, - [iommu_get_domain_for_dev() is available]) - ]) - ]) -]) diff --git a/drivers/gpu/drm/amd/dkms/m4/kernel.m4 b/drivers/gpu/drm/amd/dkms/m4/kernel.m4 index 78dbac3de395..a093970a96f7 100644 --- a/drivers/gpu/drm/amd/dkms/m4/kernel.m4 +++ b/drivers/gpu/drm/amd/dkms/m4/kernel.m4 @@ -129,7 +129,6 @@ AC_DEFUN([AC_CONFIG_KERNEL], [ AC_AMDGPU_I2C_LOCK_OPERATIONS_STRUCT AC_AMDGPU_DOWN_WRITE_KILLABLE AC_AMDGPU_BACKLIGHT_DEVICE_SET_BRIGHTNESS - AC_AMDGPU_IOMMU_GET_DOMAIN_FOR_DEV AC_AMDGPU_VM_OPERATIONS_STRUCT_FAULT AC_AMDGPU_VM_FAULT_ADDRESS_VMA AC_AMDGPU_HASH_FOR_EACH_XXX |