Commit c8c50a7e authored by Yong Zhao's avatar Yong Zhao Committed by Alex Deucher
Browse files

drm/amdkfd: Remove duplicate functions update_mqd_hiq() 



The functions are the same as update_mqd().

Signed-off-by: default avatarYong Zhao <Yong.Zhao@amd.com>
Reviewed-by: default avatarZhan Liu <zhan.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4ed8a037

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

+2 −14
Original line number Diff line number Diff line
@@ -282,18 +282,6 @@ static void init_mqd_hiq(struct mqd_manager *mm, void **mqd, 
			1 << CP_HQD_PQ_CONTROL__KMD_QUEUE__SHIFT;

}



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

			struct queue_properties *q)

{

	struct v10_compute_mqd *m;



	update_mqd(mm, mqd, q);



	/* TODO: what's the point? update_mqd already does this. */

	m = get_mqd(mqd);

	m->cp_hqd_vmid = q->vmid;

}



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

		struct kfd_mem_obj *mqd_mem_obj, uint64_t *gart_addr,

		struct queue_properties *q)
@@ -422,7 +410,7 @@ struct mqd_manager *mqd_manager_init_v10(enum KFD_MQD_TYPE type, 
		mqd->init_mqd = init_mqd_hiq;

		mqd->free_mqd = free_mqd_hiq_sdma;

		mqd->load_mqd = load_mqd;

		mqd->update_mqd = update_mqd_hiq;

		mqd->update_mqd = update_mqd;

		mqd->destroy_mqd = destroy_mqd;

		mqd->is_occupied = is_occupied;

		mqd->mqd_size = sizeof(struct v10_compute_mqd);
@@ -436,7 +424,7 @@ struct mqd_manager *mqd_manager_init_v10(enum KFD_MQD_TYPE type, 
		mqd->init_mqd = init_mqd_hiq;

		mqd->free_mqd = free_mqd;

		mqd->load_mqd = load_mqd;

		mqd->update_mqd = update_mqd_hiq;

		mqd->update_mqd = update_mqd;

		mqd->destroy_mqd = destroy_mqd;

		mqd->is_occupied = is_occupied;

		mqd->mqd_size = sizeof(struct v10_compute_mqd);

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

+2 −14
Original line number Diff line number Diff line
@@ -325,18 +325,6 @@ static void init_mqd_hiq(struct mqd_manager *mm, void **mqd, 
			1 << CP_HQD_PQ_CONTROL__KMD_QUEUE__SHIFT;

}



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

			struct queue_properties *q)

{

	struct v9_mqd *m;



	update_mqd(mm, mqd, q);



	/* TODO: what's the point? update_mqd already does this. */

	m = get_mqd(mqd);

	m->cp_hqd_vmid = q->vmid;

}



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

		struct kfd_mem_obj *mqd_mem_obj, uint64_t *gart_addr,

		struct queue_properties *q)
@@ -462,7 +450,7 @@ struct mqd_manager *mqd_manager_init_v9(enum KFD_MQD_TYPE type, 
		mqd->init_mqd = init_mqd_hiq;

		mqd->free_mqd = free_mqd_hiq_sdma;

		mqd->load_mqd = load_mqd;

		mqd->update_mqd = update_mqd_hiq;

		mqd->update_mqd = update_mqd;

		mqd->destroy_mqd = destroy_mqd;

		mqd->is_occupied = is_occupied;

		mqd->mqd_size = sizeof(struct v9_mqd);
@@ -475,7 +463,7 @@ struct mqd_manager *mqd_manager_init_v9(enum KFD_MQD_TYPE type, 
		mqd->init_mqd = init_mqd_hiq;

		mqd->free_mqd = free_mqd;

		mqd->load_mqd = load_mqd;

		mqd->update_mqd = update_mqd_hiq;

		mqd->update_mqd = update_mqd;

		mqd->destroy_mqd = destroy_mqd;

		mqd->is_occupied = is_occupied;

		mqd->mqd_size = sizeof(struct v9_mqd);

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

+0 −4
Original line number Diff line number Diff line
@@ -312,11 +312,7 @@ static void init_mqd_hiq(struct mqd_manager *mm, void **mqd, 
static void update_mqd_hiq(struct mqd_manager *mm, void *mqd,

			struct queue_properties *q)

{

	struct vi_mqd *m;

	__update_mqd(mm, mqd, q, MTYPE_UC, 0);



	m = get_mqd(mqd);

	m->cp_hqd_vmid = q->vmid;

}



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE