drm/amdkfd: Allocate hiq and sdma mqd from mqd trunk

Instead of allocat hiq and sdma mqd from sub-allocator, allocate
them from a mqd trunk pool. This is done for all asics

Signed-off-by: Oak Zeng <ozeng@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
index eeb2b60a36b55746bd6d9b3dd8fc0e4483c42001..9307811bc4277b8763e57f8aa2b699c19d735a4e 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
@@ -23,6 +23,55 @@
 
 #include "kfd_mqd_manager.h"
 #include "amdgpu_amdkfd.h"
+#include "kfd_device_queue_manager.h"
+
+struct kfd_mem_obj *allocate_hiq_mqd(struct kfd_dev *dev)
+{
+       struct kfd_mem_obj *mqd_mem_obj = NULL;
+
+       mqd_mem_obj = kzalloc(sizeof(struct kfd_mem_obj), GFP_KERNEL);
+       if (!mqd_mem_obj)
+               return NULL;
+
+       mqd_mem_obj->gtt_mem = dev->dqm->hiq_sdma_mqd.gtt_mem;
+       mqd_mem_obj->gpu_addr = dev->dqm->hiq_sdma_mqd.gpu_addr;
+       mqd_mem_obj->cpu_ptr = dev->dqm->hiq_sdma_mqd.cpu_ptr;
+
+       return mqd_mem_obj;
+}
+
+struct kfd_mem_obj *allocate_sdma_mqd(struct kfd_dev *dev,
+                                       struct queue_properties *q)
+{
+       struct kfd_mem_obj *mqd_mem_obj = NULL;
+       uint64_t offset;
+
+       mqd_mem_obj = kzalloc(sizeof(struct kfd_mem_obj), GFP_KERNEL);
+       if (!mqd_mem_obj)
+               return NULL;
+
+       offset = (q->sdma_engine_id *
+               dev->device_info->num_sdma_queues_per_engine +
+               q->sdma_queue_id) *
+               dev->dqm->mqd_mgrs[KFD_MQD_TYPE_SDMA]->mqd_size;
+
+       offset += dev->dqm->mqd_mgrs[KFD_MQD_TYPE_HIQ]->mqd_size;
+
+       mqd_mem_obj->gtt_mem = (void *)((uint64_t)dev->dqm->hiq_sdma_mqd.gtt_mem
+                               + offset);
+       mqd_mem_obj->gpu_addr = dev->dqm->hiq_sdma_mqd.gpu_addr + offset;
+       mqd_mem_obj->cpu_ptr = (uint32_t *)((uint64_t)
+                               dev->dqm->hiq_sdma_mqd.cpu_ptr + offset);
+
+       return mqd_mem_obj;
+}
+
+void uninit_mqd_hiq_sdma(struct mqd_manager *mm, void *mqd,
+                       struct kfd_mem_obj *mqd_mem_obj)
+{
+       WARN_ON(!mqd_mem_obj->gtt_mem);
+       kfree(mqd_mem_obj);
+}
 
 void mqd_symmetrically_map_cu_mask(struct mqd_manager *mm,
                const uint32_t *cu_mask, uint32_t cu_mask_count,

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h
index 009d232fb60b8ef60f36f024959e3626861be2d7..56af256a191b690d2b5dafdbd73744f4ef7ae1db 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h
@@ -102,6 +102,13 @@ struct mqd_manager {
        uint32_t mqd_size;
 };
 
+struct kfd_mem_obj *allocate_hiq_mqd(struct kfd_dev *dev);
+
+struct kfd_mem_obj *allocate_sdma_mqd(struct kfd_dev *dev,
+                                       struct queue_properties *q);
+void uninit_mqd_hiq_sdma(struct mqd_manager *mm, void *mqd,
+                               struct kfd_mem_obj *mqd_mem_obj);
+
 void mqd_symmetrically_map_cu_mask(struct mqd_manager *mm,
                const uint32_t *cu_mask, uint32_t cu_mask_count,
                uint32_t *se_mask);

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c
index a00402077e34a232da8cba735eb3b195f38d78c5..6e8509ec29d9e0ebae9af491842768abafa390ec 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c
@@ -71,6 +71,9 @@ static struct kfd_mem_obj *allocate_mqd(struct kfd_dev *kfd,
 {
        struct kfd_mem_obj *mqd_mem_obj;
 
+       if (q->type == KFD_QUEUE_TYPE_HIQ)
+               return allocate_hiq_mqd(kfd);
+
        if (kfd_gtt_sa_allocate(kfd, sizeof(struct cik_mqd),
                        &mqd_mem_obj))
                return NULL;
@@ -148,12 +151,10 @@ static int init_mqd_sdma(struct mqd_manager *mm, void **mqd,
 {
        int retval;
        struct cik_sdma_rlc_registers *m;
+       struct kfd_dev *dev = mm->dev;
 
-       retval = kfd_gtt_sa_allocate(mm->dev,
-                                       sizeof(struct cik_sdma_rlc_registers),
-                                       mqd_mem_obj);
-
-       if (retval != 0)
+       *mqd_mem_obj = allocate_sdma_mqd(dev, q);
+       if (!*mqd_mem_obj)
                return -ENOMEM;
 
        m = (struct cik_sdma_rlc_registers *) (*mqd_mem_obj)->cpu_ptr;
@@ -175,11 +176,6 @@ static void uninit_mqd(struct mqd_manager *mm, void *mqd,
        kfd_gtt_sa_free(mm->dev, mqd_mem_obj);
 }
 
-static void uninit_mqd_sdma(struct mqd_manager *mm, void *mqd,
-                               struct kfd_mem_obj *mqd_mem_obj)
-{
-       kfd_gtt_sa_free(mm->dev, mqd_mem_obj);
-}
 
 static int load_mqd(struct mqd_manager *mm, void *mqd, uint32_t pipe_id,
                    uint32_t queue_id, struct queue_properties *p,
@@ -419,7 +415,7 @@ struct mqd_manager *mqd_manager_init_cik(enum KFD_MQD_TYPE type,
                break;
        case KFD_MQD_TYPE_HIQ:
                mqd->init_mqd = init_mqd_hiq;
-               mqd->uninit_mqd = uninit_mqd;
+               mqd->uninit_mqd = uninit_mqd_hiq_sdma;
                mqd->load_mqd = load_mqd;
                mqd->update_mqd = update_mqd_hiq;
                mqd->destroy_mqd = destroy_mqd;
@@ -443,7 +439,7 @@ struct mqd_manager *mqd_manager_init_cik(enum KFD_MQD_TYPE type,
                break;
        case KFD_MQD_TYPE_SDMA:
                mqd->init_mqd = init_mqd_sdma;
-               mqd->uninit_mqd = uninit_mqd_sdma;
+               mqd->uninit_mqd = uninit_mqd_hiq_sdma;
                mqd->load_mqd = load_mqd_sdma;
                mqd->update_mqd = update_mqd_sdma;
                mqd->destroy_mqd = destroy_mqd_sdma;

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
index 8f8166189fd5ceb72bffb52c17135fb767bc6d45..4750338199b6d8911284bc5bba8930fd866582d1 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
@@ -73,6 +73,9 @@ static struct kfd_mem_obj *allocate_mqd(struct kfd_dev *kfd,
        int retval;
        struct kfd_mem_obj *mqd_mem_obj = NULL;
 
+       if (q->type == KFD_QUEUE_TYPE_HIQ)
+               return allocate_hiq_mqd(kfd);
+
        /* From V9,  for CWSR, the control stack is located on the next page
         * boundary after the mqd, we will use the gtt allocation function
         * instead of sub-allocation function.
@@ -346,13 +349,10 @@ static int init_mqd_sdma(struct mqd_manager *mm, void **mqd,
 {
        int retval;
        struct v9_sdma_mqd *m;
+       struct kfd_dev *dev = mm->dev;
 
-
-       retval = kfd_gtt_sa_allocate(mm->dev,
-                       sizeof(struct v9_sdma_mqd),
-                       mqd_mem_obj);
-
-       if (retval != 0)
+       *mqd_mem_obj = allocate_sdma_mqd(dev, q);
+       if (!*mqd_mem_obj)
                return -ENOMEM;
 
        m = (struct v9_sdma_mqd *) (*mqd_mem_obj)->cpu_ptr;
@@ -368,12 +368,6 @@ static int init_mqd_sdma(struct mqd_manager *mm, void **mqd,
        return retval;
 }
 
-static void uninit_mqd_sdma(struct mqd_manager *mm, void *mqd,
-               struct kfd_mem_obj *mqd_mem_obj)
-{
-       kfd_gtt_sa_free(mm->dev, mqd_mem_obj);
-}
-
 static int load_mqd_sdma(struct mqd_manager *mm, void *mqd,
                uint32_t pipe_id, uint32_t queue_id,
                struct queue_properties *p, struct mm_struct *mms)
@@ -484,7 +478,7 @@ struct mqd_manager *mqd_manager_init_v9(enum KFD_MQD_TYPE type,
                break;
        case KFD_MQD_TYPE_HIQ:
                mqd->init_mqd = init_mqd_hiq;
-               mqd->uninit_mqd = uninit_mqd;
+               mqd->uninit_mqd = uninit_mqd_hiq_sdma;
                mqd->load_mqd = load_mqd;
                mqd->update_mqd = update_mqd_hiq;
                mqd->destroy_mqd = destroy_mqd;
@@ -508,7 +502,7 @@ struct mqd_manager *mqd_manager_init_v9(enum KFD_MQD_TYPE type,
                break;
        case KFD_MQD_TYPE_SDMA:
                mqd->init_mqd = init_mqd_sdma;
-               mqd->uninit_mqd = uninit_mqd_sdma;
+               mqd->uninit_mqd = uninit_mqd_hiq_sdma;
                mqd->load_mqd = load_mqd_sdma;
                mqd->update_mqd = update_mqd_sdma;
                mqd->destroy_mqd = destroy_mqd_sdma;

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
index 7f0b10e46358b79999a53546de6e6a4480bab0ad..b550dea9b10a93964a87a48e53287b8a2f79aa7e 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
@@ -73,6 +73,9 @@ static struct kfd_mem_obj *allocate_mqd(struct kfd_dev *kfd,
 {
        struct kfd_mem_obj *mqd_mem_obj;
 
+       if (q->type == KFD_QUEUE_TYPE_HIQ)
+               return allocate_hiq_mqd(kfd);
+
        if (kfd_gtt_sa_allocate(kfd, sizeof(struct vi_mqd),
                        &mqd_mem_obj))
                return NULL;
@@ -341,13 +344,10 @@ static int init_mqd_sdma(struct mqd_manager *mm, void **mqd,
 {
        int retval;
        struct vi_sdma_mqd *m;
+       struct kfd_dev *dev = mm->dev;
 
-
-       retval = kfd_gtt_sa_allocate(mm->dev,
-                       sizeof(struct vi_sdma_mqd),
-                       mqd_mem_obj);
-
-       if (retval != 0)
+       *mqd_mem_obj = allocate_sdma_mqd(dev, q);
+       if (!*mqd_mem_obj)
                return -ENOMEM;
 
        m = (struct vi_sdma_mqd *) (*mqd_mem_obj)->cpu_ptr;
@@ -363,12 +363,6 @@ static int init_mqd_sdma(struct mqd_manager *mm, void **mqd,
        return retval;
 }
 
-static void uninit_mqd_sdma(struct mqd_manager *mm, void *mqd,
-               struct kfd_mem_obj *mqd_mem_obj)
-{
-       kfd_gtt_sa_free(mm->dev, mqd_mem_obj);
-}
-
 static int load_mqd_sdma(struct mqd_manager *mm, void *mqd,
                uint32_t pipe_id, uint32_t queue_id,
                struct queue_properties *p, struct mm_struct *mms)
@@ -478,7 +472,7 @@ struct mqd_manager *mqd_manager_init_vi(enum KFD_MQD_TYPE type,
                break;
        case KFD_MQD_TYPE_HIQ:
                mqd->init_mqd = init_mqd_hiq;
-               mqd->uninit_mqd = uninit_mqd;
+               mqd->uninit_mqd = uninit_mqd_hiq_sdma;
                mqd->load_mqd = load_mqd;
                mqd->update_mqd = update_mqd_hiq;
                mqd->destroy_mqd = destroy_mqd;
@@ -502,7 +496,7 @@ struct mqd_manager *mqd_manager_init_vi(enum KFD_MQD_TYPE type,
                break;
        case KFD_MQD_TYPE_SDMA:
                mqd->init_mqd = init_mqd_sdma;
-               mqd->uninit_mqd = uninit_mqd_sdma;
+               mqd->uninit_mqd = uninit_mqd_hiq_sdma;
                mqd->load_mqd = load_mqd_sdma;
                mqd->update_mqd = update_mqd_sdma;
                mqd->destroy_mqd = destroy_mqd_sdma;