drm/amdkfd: Make KFD_MQD_TYPE enum types H/W agnostic

As the MQD types are common across all AMD GPUs/APUs, let's remove the CIK part
from the name.

Signed-off-by: Ben Goz <ben.goz@amd.com>
Signed-off-by: Oded Gabbay <oded.gabbay@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index fead2d7c087775ffaba144e80e9b9ce017803d9a..3d5f71a6e1479ec37452994e08219f22a547eb34 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -57,8 +57,8 @@ static inline
 enum KFD_MQD_TYPE get_mqd_type_from_queue_type(enum kfd_queue_type type)
 {
        if (type == KFD_QUEUE_TYPE_SDMA)
-               return KFD_MQD_TYPE_CIK_SDMA;
-       return KFD_MQD_TYPE_CIK_CP;
+               return KFD_MQD_TYPE_SDMA;
+       return KFD_MQD_TYPE_CP;
 }
 
 static inline unsigned int get_pipes_num(struct device_queue_manager *dqm)
@@ -271,7 +271,7 @@ static int create_compute_queue_nocpsch(struct device_queue_manager *dqm,
 
        BUG_ON(!dqm || !q || !qpd);
 
-       mqd = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_CIK_COMPUTE);
+       mqd = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_COMPUTE);
        if (mqd == NULL)
                return -ENOMEM;
 
@@ -302,13 +302,13 @@ static int destroy_queue_nocpsch(struct device_queue_manager *dqm,
        pr_debug("kfd: In Func %s\n", __func__);
 
        mutex_lock(&dqm->lock);
-       mqd = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_CIK_COMPUTE);
+       mqd = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_COMPUTE);
        if (mqd == NULL) {
                retval = -ENOMEM;
                goto out;
        }
 
-       mqd_sdma = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_CIK_SDMA);
+       mqd_sdma = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_SDMA);
        if (mqd_sdma == NULL) {
                mutex_unlock(&dqm->lock);
                return -ENOMEM;
@@ -515,7 +515,7 @@ static int init_pipelines(struct device_queue_manager *dqm,
 
        memset(hpdptr, 0, CIK_HPD_EOP_BYTES * pipes_num);
 
-       mqd = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_CIK_COMPUTE);
+       mqd = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_COMPUTE);
        if (mqd == NULL) {
                kfd_gtt_sa_free(dqm->dev, dqm->pipeline_mem);
                return -ENOMEM;
@@ -646,7 +646,7 @@ static int create_sdma_queue_nocpsch(struct device_queue_manager *dqm,
        struct mqd_manager *mqd;
        int retval;
 
-       mqd = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_CIK_SDMA);
+       mqd = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_SDMA);
        if (!mqd)
                return -ENOMEM;
 

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
index 0fd8bb7c863e007c2d3acfffce5814d8715104f6..773c213f2f9ae657bb08abbb0f66638d3d4a8d60 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
@@ -57,7 +57,7 @@ static bool initialize(struct kernel_queue *kq, struct kfd_dev *dev,
        case KFD_QUEUE_TYPE_DIQ:
        case KFD_QUEUE_TYPE_HIQ:
                kq->mqd = dev->dqm->get_mqd_manager(dev->dqm,
-                                               KFD_MQD_TYPE_CIK_HIQ);
+                                               KFD_MQD_TYPE_HIQ);
                break;
        default:
                BUG();

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
index 155e33ceda9ac373797e30fc4eb24be94a7db300..be989fb228462399b6f9e25fb3e4968fb68fae6a 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
@@ -423,8 +423,8 @@ struct mqd_manager *mqd_manager_init(enum KFD_MQD_TYPE type,
        mqd->dev = dev;
 
        switch (type) {
-       case KFD_MQD_TYPE_CIK_CP:
-       case KFD_MQD_TYPE_CIK_COMPUTE:
+       case KFD_MQD_TYPE_CP:
+       case KFD_MQD_TYPE_COMPUTE:
                mqd->init_mqd = init_mqd;
                mqd->uninit_mqd = uninit_mqd;
                mqd->load_mqd = load_mqd;
@@ -432,7 +432,7 @@ struct mqd_manager *mqd_manager_init(enum KFD_MQD_TYPE type,
                mqd->destroy_mqd = destroy_mqd;
                mqd->is_occupied = is_occupied;
                break;
-       case KFD_MQD_TYPE_CIK_HIQ:
+       case KFD_MQD_TYPE_HIQ:
                mqd->init_mqd = init_mqd_hiq;
                mqd->uninit_mqd = uninit_mqd;
                mqd->load_mqd = load_mqd;
@@ -440,7 +440,7 @@ struct mqd_manager *mqd_manager_init(enum KFD_MQD_TYPE type,
                mqd->destroy_mqd = destroy_mqd;
                mqd->is_occupied = is_occupied;
                break;
-       case KFD_MQD_TYPE_CIK_SDMA:
+       case KFD_MQD_TYPE_SDMA:
                mqd->init_mqd = init_mqd_sdma;
                mqd->uninit_mqd = uninit_mqd_sdma;
                mqd->load_mqd = load_mqd_sdma;

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index 3ba34b7bb122ca99d7bb5328046bf659ac3f2d82..a4e0ddd5677812227c1dcdc1a1414d99287e7492 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -356,10 +356,10 @@ struct queue {
  * Please read the kfd_mqd_manager.h description.
  */
 enum KFD_MQD_TYPE {
-       KFD_MQD_TYPE_CIK_COMPUTE = 0, /* for no cp scheduling */
-       KFD_MQD_TYPE_CIK_HIQ, /* for hiq */
-       KFD_MQD_TYPE_CIK_CP, /* for cp queues and diq */
-       KFD_MQD_TYPE_CIK_SDMA, /* for sdma queues */
+       KFD_MQD_TYPE_COMPUTE = 0,       /* for no cp scheduling */
+       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_MAX
 };