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

drm/amdkfd: Delete KFD_MQD_TYPE_COMPUTE 



It is the same as KFD_MQD_TYPE_CP, so delete it. As a result, we will
have one less mqd mananger per device.

Signed-off-by: default avatarYong Zhao <Yong.Zhao@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6e04b224

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

+1 −1
Original line number Diff line number Diff line
@@ -1595,7 +1595,7 @@ static int get_wave_state(struct device_queue_manager *dqm, 
		goto dqm_unlock;

	}



	mqd_mgr = dqm->mqd_mgrs[KFD_MQD_TYPE_COMPUTE];

	mqd_mgr = dqm->mqd_mgrs[KFD_MQD_TYPE_CP];



	if (!mqd_mgr->get_wave_state) {

		r = -EINVAL;

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

+1 −2
Original line number Diff line number Diff line
@@ -374,7 +374,6 @@ struct mqd_manager *mqd_manager_init_cik(enum KFD_MQD_TYPE type, 


	switch (type) {

	case KFD_MQD_TYPE_CP:

	case KFD_MQD_TYPE_COMPUTE:

		mqd->allocate_mqd = allocate_mqd;

		mqd->init_mqd = init_mqd;

		mqd->free_mqd = free_mqd;
@@ -442,7 +441,7 @@ struct mqd_manager *mqd_manager_init_cik_hawaii(enum KFD_MQD_TYPE type, 
	mqd = mqd_manager_init_cik(type, dev);

	if (!mqd)

		return NULL;

	if ((type == KFD_MQD_TYPE_CP) || (type == KFD_MQD_TYPE_COMPUTE))

	if (type == KFD_MQD_TYPE_CP)

		mqd->update_mqd = update_mqd_hawaii;

	return mqd;

}

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

+0 −1
Original line number Diff line number Diff line
@@ -401,7 +401,6 @@ struct mqd_manager *mqd_manager_init_v10(enum KFD_MQD_TYPE type, 


	switch (type) {

	case KFD_MQD_TYPE_CP:

	case KFD_MQD_TYPE_COMPUTE:

		pr_debug("%s@%i\n", __func__, __LINE__);

		mqd->allocate_mqd = allocate_mqd;

		mqd->init_mqd = init_mqd;

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

+0 −1
Original line number Diff line number Diff line
@@ -444,7 +444,6 @@ struct mqd_manager *mqd_manager_init_v9(enum KFD_MQD_TYPE type, 


	switch (type) {

	case KFD_MQD_TYPE_CP:

	case KFD_MQD_TYPE_COMPUTE:

		mqd->allocate_mqd = allocate_mqd;

		mqd->init_mqd = init_mqd;

		mqd->free_mqd = free_mqd;

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

+1 −2
Original line number Diff line number Diff line
@@ -425,7 +425,6 @@ struct mqd_manager *mqd_manager_init_vi(enum KFD_MQD_TYPE type, 


	switch (type) {

	case KFD_MQD_TYPE_CP:

	case KFD_MQD_TYPE_COMPUTE:

		mqd->allocate_mqd = allocate_mqd;

		mqd->init_mqd = init_mqd;

		mqd->free_mqd = free_mqd;
@@ -494,7 +493,7 @@ struct mqd_manager *mqd_manager_init_vi_tonga(enum KFD_MQD_TYPE type, 
	mqd = mqd_manager_init_vi(type, dev);

	if (!mqd)

		return NULL;

	if ((type == KFD_MQD_TYPE_CP) || (type == KFD_MQD_TYPE_COMPUTE))

	if (type == KFD_MQD_TYPE_CP)

		mqd->update_mqd = update_mqd_tonga;

	return mqd;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE