|
@@ -36,36 +36,16 @@ int amdgpu_amdkfd_init(void)
|
|
{
|
|
{
|
|
int ret;
|
|
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);
|
|
ret = kgd2kfd_init(KFD_INTERFACE_VERSION, &kgd2kfd);
|
|
if (ret)
|
|
if (ret)
|
|
kgd2kfd = NULL;
|
|
kgd2kfd = NULL;
|
|
-
|
|
|
|
|
|
+ amdgpu_amdkfd_gpuvm_init_mem_limits();
|
|
#else
|
|
#else
|
|
kgd2kfd = NULL;
|
|
kgd2kfd = NULL;
|
|
ret = -ENOENT;
|
|
ret = -ENOENT;
|
|
#endif
|
|
#endif
|
|
|
|
|
|
-#if defined(CONFIG_HSA_AMD_MODULE) || defined(CONFIG_HSA_AMD)
|
|
|
|
- amdgpu_amdkfd_gpuvm_init_mem_limits();
|
|
|
|
-#endif
|
|
|
|
-
|
|
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -507,7 +487,7 @@ bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid)
|
|
return false;
|
|
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)
|
|
bool amdkfd_fence_check_mm(struct dma_fence *f, struct mm_struct *mm)
|
|
{
|
|
{
|
|
return false;
|
|
return false;
|