Commit b98451dc authored by Shiwu Zhang's avatar Shiwu Zhang Committed by Alex Deucher
Browse files

drm/amdkfd: Use the consolidated MQD manager functions for GFX11 



To remove duplication for GFX11 as well, use the common MQD manager
functions defined in kfd_mqd_manager.c for all version of managers

Signed-off-by: default avatarShiwu Zhang <shiwu.zhang@amd.com>
Acked-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarMukul Joshi <mukul.joshi@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 876552e5

drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c

+12 −73
Original line number Diff line number Diff line
@@ -177,14 +177,6 @@ static int load_mqd(struct mqd_manager *mm, void *mqd, 
	return r;

}



static int hiq_load_mqd_kiq(struct mqd_manager *mm, void *mqd,

			    uint32_t pipe_id, uint32_t queue_id,

			    struct queue_properties *p, struct mm_struct *mms)

{

	return mm->dev->kfd2kgd->hiq_mqd_load(mm->dev->adev, mqd, pipe_id,

					      queue_id, p->doorbell_off);

}



static void update_mqd(struct mqd_manager *mm, void *mqd,

		       struct queue_properties *q,

		       struct mqd_update_info *minfo)
@@ -256,31 +248,6 @@ static uint32_t read_doorbell_id(void *mqd) 
	return m->queue_doorbell_id0;

}



static int destroy_mqd(struct mqd_manager *mm, void *mqd,

		       enum kfd_preempt_type type,

		       unsigned int timeout, uint32_t pipe_id,

		       uint32_t queue_id)

{

	return mm->dev->kfd2kgd->hqd_destroy

		(mm->dev->adev, mqd, type, timeout,

		 pipe_id, queue_id);

}



static void free_mqd(struct mqd_manager *mm, void *mqd,

			struct kfd_mem_obj *mqd_mem_obj)

{

	kfd_gtt_sa_free(mm->dev, mqd_mem_obj);

}



static bool is_occupied(struct mqd_manager *mm, void *mqd,

			uint64_t queue_address,	uint32_t pipe_id,

			uint32_t queue_id)

{

	return mm->dev->kfd2kgd->hqd_is_occupied(

		mm->dev->adev, queue_address,

		pipe_id, queue_id);

}



static int get_wave_state(struct mqd_manager *mm, void *mqd,

			  void __user *ctl_stack,

			  u32 *ctl_stack_used_size,
@@ -349,15 +316,6 @@ static void init_mqd_sdma(struct mqd_manager *mm, void **mqd, 
	mm->update_mqd(mm, m, q, NULL);

}



static int load_mqd_sdma(struct mqd_manager *mm, void *mqd,

		uint32_t pipe_id, uint32_t queue_id,

		struct queue_properties *p, struct mm_struct *mms)

{

	return mm->dev->kfd2kgd->hqd_sdma_load(mm->dev->adev, mqd,

					       (uint32_t __user *)p->write_ptr,

					       mms);

}



#define SDMA_RLC_DUMMY_DEFAULT 0xf



static void update_mqd_sdma(struct mqd_manager *mm, void *mqd,
@@ -389,25 +347,6 @@ static void update_mqd_sdma(struct mqd_manager *mm, void *mqd, 
	q->is_active = QUEUE_IS_ACTIVE(*q);

}



/*

 *  * preempt type here is ignored because there is only one way

 *  * to preempt sdma queue

 */

static int destroy_mqd_sdma(struct mqd_manager *mm, void *mqd,

		enum kfd_preempt_type type,

		unsigned int timeout, uint32_t pipe_id,

		uint32_t queue_id)

{

	return mm->dev->kfd2kgd->hqd_sdma_destroy(mm->dev->adev, mqd, timeout);

}



static bool is_occupied_sdma(struct mqd_manager *mm, void *mqd,

		uint64_t queue_address, uint32_t pipe_id,

		uint32_t queue_id)

{

	return mm->dev->kfd2kgd->hqd_sdma_is_occupied(mm->dev->adev, mqd);

}



#if defined(CONFIG_DEBUG_FS)



static int debugfs_show_mqd(struct seq_file *m, void *data)
@@ -445,11 +384,11 @@ struct mqd_manager *mqd_manager_init_v11(enum KFD_MQD_TYPE type, 
		pr_debug("%s@%i\n", __func__, __LINE__);

		mqd->allocate_mqd = allocate_mqd;

		mqd->init_mqd = init_mqd;

		mqd->free_mqd = free_mqd;

		mqd->free_mqd = kfd_free_mqd_cp;

		mqd->load_mqd = load_mqd;

		mqd->update_mqd = update_mqd;

		mqd->destroy_mqd = destroy_mqd;

		mqd->is_occupied = is_occupied;

		mqd->destroy_mqd = kfd_destroy_mqd_cp;

		mqd->is_occupied = kfd_is_occupied_cp;

		mqd->mqd_size = sizeof(struct v11_compute_mqd);

		mqd->get_wave_state = get_wave_state;

#if defined(CONFIG_DEBUG_FS)
@@ -462,10 +401,10 @@ struct mqd_manager *mqd_manager_init_v11(enum KFD_MQD_TYPE type, 
		mqd->allocate_mqd = allocate_hiq_mqd;

		mqd->init_mqd = init_mqd_hiq;

		mqd->free_mqd = free_mqd_hiq_sdma;

		mqd->load_mqd = hiq_load_mqd_kiq;

		mqd->load_mqd = kfd_hiq_load_mqd_kiq;

		mqd->update_mqd = update_mqd;

		mqd->destroy_mqd = destroy_mqd;

		mqd->is_occupied = is_occupied;

		mqd->destroy_mqd = kfd_destroy_mqd_cp;

		mqd->is_occupied = kfd_is_occupied_cp;

		mqd->mqd_size = sizeof(struct v11_compute_mqd);

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd;
@@ -476,11 +415,11 @@ struct mqd_manager *mqd_manager_init_v11(enum KFD_MQD_TYPE type, 
	case KFD_MQD_TYPE_DIQ:

		mqd->allocate_mqd = allocate_mqd;

		mqd->init_mqd = init_mqd_hiq;

		mqd->free_mqd = free_mqd;

		mqd->free_mqd = kfd_free_mqd_cp;

		mqd->load_mqd = load_mqd;

		mqd->update_mqd = update_mqd;

		mqd->destroy_mqd = destroy_mqd;

		mqd->is_occupied = is_occupied;

		mqd->destroy_mqd = kfd_destroy_mqd_cp;

		mqd->is_occupied = kfd_is_occupied_cp;

		mqd->mqd_size = sizeof(struct v11_compute_mqd);

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd;
@@ -491,10 +430,10 @@ struct mqd_manager *mqd_manager_init_v11(enum KFD_MQD_TYPE type, 
		mqd->allocate_mqd = allocate_sdma_mqd;

		mqd->init_mqd = init_mqd_sdma;

		mqd->free_mqd = free_mqd_hiq_sdma;

		mqd->load_mqd = load_mqd_sdma;

		mqd->load_mqd = kfd_load_mqd_sdma;

		mqd->update_mqd = update_mqd_sdma;

		mqd->destroy_mqd = destroy_mqd_sdma;

		mqd->is_occupied = is_occupied_sdma;

		mqd->destroy_mqd = kfd_destroy_mqd_sdma;

		mqd->is_occupied = kfd_is_occupied_sdma;

		mqd->mqd_size = sizeof(struct v11_sdma_mqd);

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd_sdma;