drm/amdkfd: Delete KFD_MQD_TYPE_COMPUTE
Subsystems (3)
PATCH 1/1 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.
Change-Id Iaa98fc17be06b216de7a826c3577f44bc0536b4c
Signed-off-by Yong Zhao <[email protected]>
--- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 3 +-- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 1 - drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 1 - drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 3 +-- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 +-- 6 files changed, 4 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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; }
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +1 -2
@@ -508,8 +508,7 @@ struct queue {* Please read the kfd_mqd_manager.h description. */ enum KFD_MQD_TYPE { -KFD_MQD_TYPE_COMPUTE =0 ,/* for no cp scheduling */ -KFD_MQD_TYPE_HIQ ,/* for hiq */ +KFD_MQD_TYPE_HIQ =0 ,/* for hiq */ KFD_MQD_TYPE_CP ,/* for cp queues and diq */ KFD_MQD_TYPE_SDMA ,/* for sdma queues */ KFD_MQD_TYPE_DIQ ,/* for diq */
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Felix Kuehling
Reviewed-byQuoted 5 lines · Yong Zhao
It is the same as
KFD_MQD_TYPE_CP, so delete it. As a result, we will have one less mqd mananger per device.Change-Id Iaa98fc17be06b216de7a826c3577f44bc0536b4cSigned-off-by Yong Zhao <[email protected]>
Reviewed-by Felix Kuehling <[email protected]>
Quoted 93 lines
--- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 3 +-- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 1 - drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 1 - drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 3 +-- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 +-- 6 files changed, 4 insertions(+), 9 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +1
-1@@ -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@@ -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@@ -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@@ -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@@ -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; }drivers/gpu/drm/amd/amdkfd/kfd_priv.h +0
-0
drivers/gpu/drm/amd/amdkfd/kfd_priv.h struct queue { · line 514
Quoted 9 lines
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +1
-2@@ -508,8 +508,7 @@ struct queue {* Please read the kfd_mqd_manager.h description. */ enum KFD_MQD_TYPE { -KFD_MQD_TYPE_COMPUTE =0 ,/* for no cp scheduling */ -KFD_MQD_TYPE_HIQ ,/* for hiq */ +KFD_MQD_TYPE_HIQ =0 ,/* for hiq */ KFD_MQD_TYPE_CP ,/* for cp queues and diq */ KFD_MQD_TYPE_SDMA ,/* for sdma queues */ KFD_MQD_TYPE_DIQ ,/* for diq */
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx