Commit 82b7b619 authored by Amber Lin's avatar Amber Lin Committed by Alex Deucher
Browse files

drm/amdgpu: Remove CONFIG_HSA_AMD_MODULE 



After amdkfd is merged to amdgpu, CONFIG_HSA_AMD_MODULE no longer exists.

Signed-off-by: default avatarAmber Lin <Amber.Lin@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 04d5e276

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

+3 −23
Original line number Diff line number Diff line
@@ -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;

}
@@ -507,7 +487,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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE