[PATCH 2/3] drm/amdgpu: Remove CONFIG_HSA_AMD_MODULE

[Felix Kuehling]

On 2018-08-23 11:17 AM, Amber Lin wrote:
> After amdkfd is merged to amdgpu, CONFIG_HSA_AMD_MODULE no longer exists.
>
> Change-Id: I42096cdf887e0d776075f3dd3e8d3f153aff4e85
> Signed-off-by: Amber Lin <Amber.Lin at amd.com>

Reviewed-by: Felix Kuehling <Felix.Kuehling at 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 e3ed08d..8c652ec 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;
>  }
>  
> @@ -471,7 +451,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;