Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59f650a0 authored by Oak Zeng's avatar Oak Zeng Committed by Alex Deucher
Browse files

drm/amdkfd: Introduce DIQ type mqd manager 



With introduction of new mqd allocation scheme for HIQ,
DIQ and HIQ use different mqd allocation scheme, DIQ
can't reuse HIQ mqd manager

Signed-off-by: default avatarOak Zeng <ozeng@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 972fcdb5

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

+3 −0
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ static bool initialize(struct kernel_queue *kq, struct kfd_dev *dev, 
	kq->nop_packet = nop.u32all;

	switch (type) {

	case KFD_QUEUE_TYPE_DIQ:

		kq->mqd_mgr = dev->dqm->ops.get_mqd_manager(dev->dqm,

						KFD_MQD_TYPE_DIQ);

		break;

	case KFD_QUEUE_TYPE_HIQ:

		kq->mqd_mgr = dev->dqm->ops.get_mqd_manager(dev->dqm,

						KFD_MQD_TYPE_HIQ);

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

+11 −0
Original line number Diff line number Diff line
@@ -413,6 +413,17 @@ struct mqd_manager *mqd_manager_init_cik(enum KFD_MQD_TYPE type, 
		mqd->is_occupied = is_occupied;

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd;

#endif

		break;

	case KFD_MQD_TYPE_DIQ:

		mqd->init_mqd = init_mqd_hiq;

		mqd->uninit_mqd = uninit_mqd;

		mqd->load_mqd = load_mqd;

		mqd->update_mqd = update_mqd_hiq;

		mqd->destroy_mqd = destroy_mqd;

		mqd->is_occupied = is_occupied;

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd;

#endif

		break;

	case KFD_MQD_TYPE_SDMA:

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

+11 −0
Original line number Diff line number Diff line
@@ -472,6 +472,17 @@ struct mqd_manager *mqd_manager_init_v9(enum KFD_MQD_TYPE type, 
		mqd->is_occupied = is_occupied;

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd;

#endif

		break;

	case KFD_MQD_TYPE_DIQ:

		mqd->init_mqd = init_mqd_hiq;

		mqd->uninit_mqd = uninit_mqd;

		mqd->load_mqd = load_mqd;

		mqd->update_mqd = update_mqd_hiq;

		mqd->destroy_mqd = destroy_mqd;

		mqd->is_occupied = is_occupied;

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd;

#endif

		break;

	case KFD_MQD_TYPE_SDMA:

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

+11 −0
Original line number Diff line number Diff line
@@ -472,6 +472,17 @@ struct mqd_manager *mqd_manager_init_vi(enum KFD_MQD_TYPE type, 
		mqd->is_occupied = is_occupied;

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd;

#endif

		break;

	case KFD_MQD_TYPE_DIQ:

		mqd->init_mqd = init_mqd_hiq;

		mqd->uninit_mqd = uninit_mqd;

		mqd->load_mqd = load_mqd;

		mqd->update_mqd = update_mqd_hiq;

		mqd->destroy_mqd = destroy_mqd;

		mqd->is_occupied = is_occupied;

#if defined(CONFIG_DEBUG_FS)

		mqd->debugfs_show_mqd = debugfs_show_mqd;

#endif

		break;

	case KFD_MQD_TYPE_SDMA:

drivers/gpu/drm/amd/amdkfd/kfd_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -475,6 +475,7 @@ enum KFD_MQD_TYPE { 
	KFD_MQD_TYPE_HIQ,		/* for hiq */

	KFD_MQD_TYPE_CP,		/* for cp queues and diq */

	KFD_MQD_TYPE_SDMA,		/* for sdma queues */

	KFD_MQD_TYPE_DIQ,		/* for diq */

	KFD_MQD_TYPE_MAX

};