diff options
Diffstat (limited to 'drivers/gpu/drm/amd')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 10 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 10 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 5 | 
3 files changed, 0 insertions, 25 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c index ea54e53172b9..0ff36d45a597 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c @@ -98,8 +98,6 @@ static void kgd_program_sh_mem_settings(struct kgd_dev *kgd, uint32_t vmid,  static int kgd_set_pasid_vmid_mapping(struct kgd_dev *kgd, unsigned int pasid,  					unsigned int vmid); -static int kgd_init_pipeline(struct kgd_dev *kgd, uint32_t pipe_id, -				uint32_t hpd_size, uint64_t hpd_gpu_addr);  static int kgd_init_interrupts(struct kgd_dev *kgd, uint32_t pipe_id);  static int kgd_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id,  			uint32_t queue_id, uint32_t __user *wptr, @@ -183,7 +181,6 @@ static const struct kfd2kgd_calls kfd2kgd = {  	.free_pasid = amdgpu_pasid_free,  	.program_sh_mem_settings = kgd_program_sh_mem_settings,  	.set_pasid_vmid_mapping = kgd_set_pasid_vmid_mapping, -	.init_pipeline = kgd_init_pipeline,  	.init_interrupts = kgd_init_interrupts,  	.hqd_load = kgd_hqd_load,  	.hqd_sdma_load = kgd_hqd_sdma_load, @@ -309,13 +306,6 @@ static int kgd_set_pasid_vmid_mapping(struct kgd_dev *kgd, unsigned int pasid,  	return 0;  } -static int kgd_init_pipeline(struct kgd_dev *kgd, uint32_t pipe_id, -				uint32_t hpd_size, uint64_t hpd_gpu_addr) -{ -	/* amdgpu owns the per-pipe state */ -	return 0; -} -  static int kgd_init_interrupts(struct kgd_dev *kgd, uint32_t pipe_id)  {  	struct amdgpu_device *adev = get_amdgpu_device(kgd); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c index 89264c9a5e9f..6ef9762b4b00 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c @@ -57,8 +57,6 @@ static void kgd_program_sh_mem_settings(struct kgd_dev *kgd, uint32_t vmid,  		uint32_t sh_mem_bases);  static int kgd_set_pasid_vmid_mapping(struct kgd_dev *kgd, unsigned int pasid,  		unsigned int vmid); -static int kgd_init_pipeline(struct kgd_dev *kgd, uint32_t pipe_id, -		uint32_t hpd_size, uint64_t hpd_gpu_addr);  static int kgd_init_interrupts(struct kgd_dev *kgd, uint32_t pipe_id);  static int kgd_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id,  			uint32_t queue_id, uint32_t __user *wptr, @@ -141,7 +139,6 @@ static const struct kfd2kgd_calls kfd2kgd = {  	.free_pasid = amdgpu_pasid_free,  	.program_sh_mem_settings = kgd_program_sh_mem_settings,  	.set_pasid_vmid_mapping = kgd_set_pasid_vmid_mapping, -	.init_pipeline = kgd_init_pipeline,  	.init_interrupts = kgd_init_interrupts,  	.hqd_load = kgd_hqd_load,  	.hqd_sdma_load = kgd_hqd_sdma_load, @@ -270,13 +267,6 @@ static int kgd_set_pasid_vmid_mapping(struct kgd_dev *kgd, unsigned int pasid,  	return 0;  } -static int kgd_init_pipeline(struct kgd_dev *kgd, uint32_t pipe_id, -				uint32_t hpd_size, uint64_t hpd_gpu_addr) -{ -	/* amdgpu owns the per-pipe state */ -	return 0; -} -  static int kgd_init_interrupts(struct kgd_dev *kgd, uint32_t pipe_id)  {  	struct amdgpu_device *adev = get_amdgpu_device(kgd); diff --git a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h index 286cfe7068c1..7cf35068866f 100644 --- a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h +++ b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h @@ -173,8 +173,6 @@ struct tile_config {   * @set_pasid_vmid_mapping: Exposes pasid/vmid pair to the H/W for no cp   * scheduling mode. Only used for no cp scheduling mode.   * - * @init_pipeline: Initialized the compute pipelines. - *   * @hqd_load: Loads the mqd structure to a H/W hqd slot. used only for no cp   * sceduling mode.   * @@ -274,9 +272,6 @@ struct kfd2kgd_calls {  	int (*set_pasid_vmid_mapping)(struct kgd_dev *kgd, unsigned int pasid,  					unsigned int vmid); -	int (*init_pipeline)(struct kgd_dev *kgd, uint32_t pipe_id, -				uint32_t hpd_size, uint64_t hpd_gpu_addr); -  	int (*init_interrupts)(struct kgd_dev *kgd, uint32_t pipe_id);  	int (*hqd_load)(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id, | 
