1 files changed, 73 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2683-drm-amdgpu-Remove-CONFIG_HSA_AMD_MODULE.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2683-drm-amdgpu-Remove-CONFIG_HSA_AMD_MODULE.patch
new file mode 100644
index 00000000..1cbeb776
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2683-drm-amdgpu-Remove-CONFIG_HSA_AMD_MODULE.patch
@@ -0,0 +1,73 @@
+From a0ab652510d732ff897f72e6be2b6793e4eb65d4 Mon Sep 17 00:00:00 2001
+From: Amber Lin <Amber.Lin@amd.com>
+Date: Wed, 22 Aug 2018 17:05:33 -0400
+Subject: [PATCH 2683/2940] drm/amdgpu: Remove CONFIG_HSA_AMD_MODULE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+After amdkfd is merged to amdgpu, CONFIG_HSA_AMD_MODULE no longer exists.
+
+Signed-off-by: Amber Lin <Amber.Lin@amd.com>
+Acked-by: Christian König <christian.koenig@amd.com>
+Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 26 +++-------------------
+ 1 file changed, 3 insertions(+), 23 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+index b048b0cb4731..9e6a4c42c233 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+@@ -36,36 +36,16 @@ int amdgpu_amdkfd_init(void)
+ {
+ 	int ret;
+ 
+-#if defined(CONFIG_HSA_AMD_MODULE)
+-	int (*kgd2kfd_init_p)(unsigned int, const struct kgd2kfd_calls**);
+-
+-	kgd2kfd_init_p = symbol_request(kgd2kfd_init);
+-
+-	if (kgd2kfd_init_p == NULL)
+-		return -ENOENT;
+-
+-	ret = kgd2kfd_init_p(KFD_INTERFACE_VERSION, &kgd2kfd);
+-	if (ret) {
+-		symbol_put(kgd2kfd_init);
+-		kgd2kfd = NULL;
+-	}
+-
+-
+-#elif defined(CONFIG_HSA_AMD)
+-
++#ifdef CONFIG_HSA_AMD
+ 	ret = kgd2kfd_init(KFD_INTERFACE_VERSION, &kgd2kfd);
+ 	if (ret)
+ 		kgd2kfd = NULL;
+-
++	amdgpu_amdkfd_gpuvm_init_mem_limits();
+ #else
+ 	kgd2kfd = NULL;
+ 	ret = -ENOENT;
+ #endif
+ 
+-#if defined(CONFIG_HSA_AMD_MODULE) || defined(CONFIG_HSA_AMD)
+-	amdgpu_amdkfd_gpuvm_init_mem_limits();
+-#endif
+-
+ 	return ret;
+ }
+ 
+@@ -514,7 +494,7 @@ bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid)
+ 	return false;
+ }
+ 
+-#if !defined(CONFIG_HSA_AMD_MODULE) && !defined(CONFIG_HSA_AMD)
++#ifndef CONFIG_HSA_AMD
+ bool amdkfd_fence_check_mm(struct dma_fence *f, struct mm_struct *mm)
+ {
+ 	return false;
+-- 
+2.17.1
+