drm/amdkfd: Use AMDGPU_MQD_SIZE_ALIGN in gfx11+ kfd mqd manager

MES is enabled by default from gfx11+, use AMDGPU_MQD_SIZE_ALIGN
unconditionally for gfx11+.

Signed-off-by: Lang Yu <lang.yu@amd.com>
Reviewed-by: David Belanger <david.belanger@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Mukul Joshi <mukul.joshi@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 ceb6566ff3e1dd5d35c23122d6e426d77d154068..d88d0de58edd1ecd912b652d5b8a2f4aab656f5f 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
@@ -292,6 +292,9 @@ void kfd_get_hiq_xcc_mqd(struct kfd_node *dev, struct kfd_mem_obj *mqd_mem_obj,
 uint64_t kfd_mqd_stride(struct mqd_manager *mm,
                        struct queue_properties *q)
 {
+       if (KFD_GC_VERSION(mm->dev) >= IP_VERSION(11, 0, 0))
+               return AMDGPU_MQD_SIZE_ALIGN(mm->mqd_size);
+
        return mm->mqd_size;
 }
 

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c
index 5c44d09877374ee599a17e2b4289cad0728b36b0..7e5a7ab6d0c01f1679fe68afac4c1bf2115be929 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c
@@ -102,20 +102,11 @@ static void set_priority(struct v11_compute_mqd *m, struct queue_properties *q)
 static struct kfd_mem_obj *allocate_mqd(struct mqd_manager *mm,
                struct queue_properties *q)
 {
+       u32 mqd_size = AMDGPU_MQD_SIZE_ALIGN(mm->mqd_size);
        struct kfd_node *node = mm->dev;
        struct kfd_mem_obj *mqd_mem_obj;
-       int size;
-
-       /*
-        * MES write to areas beyond MQD size. So allocate
-        * 1 PAGE_SIZE memory for MQD is MES is enabled.
-        */
-       if (node->kfd->shared_resources.enable_mes)
-               size = PAGE_SIZE;
-       else
-               size = sizeof(struct v11_compute_mqd);
 
-       if (kfd_gtt_sa_allocate(node, size, &mqd_mem_obj))
+       if (kfd_gtt_sa_allocate(node, mqd_size, &mqd_mem_obj))
                return NULL;
 
        return mqd_mem_obj;
@@ -127,18 +118,13 @@ static void init_mqd(struct mqd_manager *mm, void **mqd,
 {
        uint64_t addr;
        struct v11_compute_mqd *m;
-       int size;
+       u32 mqd_size = AMDGPU_MQD_SIZE_ALIGN(mm->mqd_size);
        uint32_t wa_mask = q->is_dbg_wa ? 0xffff : 0xffffffff;
 
        m = (struct v11_compute_mqd *) mqd_mem_obj->cpu_ptr;
        addr = mqd_mem_obj->gpu_addr;
 
-       if (mm->dev->kfd->shared_resources.enable_mes)
-               size = PAGE_SIZE;
-       else
-               size = sizeof(struct v11_compute_mqd);
-
-       memset(m, 0, size);
+       memset(m, 0, mqd_size);
 
        m->header = 0xC0310800;
        m->compute_pipelinestat_enable = 1;

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c
index b7ac2dea877580ec77a00545d32e6e9ac60b1cf3..a51f217329db0c5b265c27713fe441f45d83a8df 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c
@@ -83,14 +83,11 @@ static void set_priority(struct v12_compute_mqd *m, struct queue_properties *q)
 static struct kfd_mem_obj *allocate_mqd(struct mqd_manager *mm,
                struct queue_properties *q)
 {
+       u32 mqd_size = AMDGPU_MQD_SIZE_ALIGN(mm->mqd_size);
        struct kfd_node *node = mm->dev;
        struct kfd_mem_obj *mqd_mem_obj;
 
-       /*
-        * Allocate one PAGE_SIZE memory for MQD as MES writes to areas beyond
-        * struct MQD size.
-        */
-       if (kfd_gtt_sa_allocate(node, PAGE_SIZE, &mqd_mem_obj))
+       if (kfd_gtt_sa_allocate(node, mqd_size, &mqd_mem_obj))
                return NULL;
 
        return mqd_mem_obj;
@@ -102,11 +99,12 @@ static void init_mqd(struct mqd_manager *mm, void **mqd,
 {
        uint64_t addr;
        struct v12_compute_mqd *m;
+       u32 mqd_size = AMDGPU_MQD_SIZE_ALIGN(mm->mqd_size);
 
        m = (struct v12_compute_mqd *) mqd_mem_obj->cpu_ptr;
        addr = mqd_mem_obj->gpu_addr;
 
-       memset(m, 0, PAGE_SIZE);
+       memset(m, 0, mqd_size);
 
        m->header = 0xC0310800;
        m->compute_pipelinestat_enable = 1;

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c
index 0b0d802a091738ffcda29377e07baccbc8b15672..d0776ba2cc999a4f022f62d36678c05c126dc240 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c
@@ -32,17 +32,6 @@
 #include "amdgpu_amdkfd.h"
 #include "kfd_device_queue_manager.h"
 
-#define MQD_SIZE       (2 * PAGE_SIZE)
-
-static uint64_t mqd_stride_v12_1(struct mqd_manager *mm,
-                               struct queue_properties *q)
-{
-       if (q->type == KFD_QUEUE_TYPE_COMPUTE)
-               return MQD_SIZE;
-       else
-               return PAGE_SIZE;
-}
-
 static inline struct v12_1_compute_mqd *get_mqd(void *mqd)
 {
        return (struct v12_1_compute_mqd *)mqd;
@@ -148,21 +137,14 @@ static void set_priority(struct v12_1_compute_mqd *m, struct queue_properties *q
 static struct kfd_mem_obj *allocate_mqd(struct mqd_manager *mm,
                struct queue_properties *q)
 {
+       u32 mqd_size = AMDGPU_MQD_SIZE_ALIGN(mm->mqd_size);
        struct kfd_node *node = mm->dev;
        struct kfd_mem_obj *mqd_mem_obj;
-       unsigned int size;
 
-       /*
-        * Allocate two PAGE_SIZE memory for Compute MQD as MES writes to areas beyond
-        * struct MQD size. Size of the Compute MQD is 1 PAGE_SIZE.
-        * For SDMA MQD, we allocate 1 Page_size.
-        */
        if (q->type == KFD_QUEUE_TYPE_COMPUTE)
-               size = MQD_SIZE * NUM_XCC(node->xcc_mask);
-       else
-               size = PAGE_SIZE;
+               mqd_size *= NUM_XCC(node->xcc_mask);
 
-       if (kfd_gtt_sa_allocate(node, size, &mqd_mem_obj))
+       if (kfd_gtt_sa_allocate(node, mqd_size, &mqd_mem_obj))
                return NULL;
 
        return mqd_mem_obj;
@@ -174,11 +156,12 @@ static void init_mqd(struct mqd_manager *mm, void **mqd,
 {
        uint64_t addr;
        struct v12_1_compute_mqd *m;
+       u32 mqd_size = AMDGPU_MQD_SIZE_ALIGN(mm->mqd_size);
 
        m = (struct v12_1_compute_mqd *) mqd_mem_obj->cpu_ptr;
        addr = mqd_mem_obj->gpu_addr;
 
-       memset(m, 0, MQD_SIZE);
+       memset(m, 0, mqd_size);
 
        m->header = 0xC0310800;
        m->compute_pipelinestat_enable = 1;
@@ -681,7 +664,7 @@ struct mqd_manager *mqd_manager_init_v12_1(enum KFD_MQD_TYPE type,
                mqd->is_occupied = kfd_is_occupied_cp;
                mqd->mqd_size = sizeof(struct v12_1_compute_mqd);
                mqd->get_wave_state = get_wave_state_v12_1;
-               mqd->mqd_stride = mqd_stride_v12_1;
+               mqd->mqd_stride = kfd_mqd_stride;
 #if defined(CONFIG_DEBUG_FS)
                mqd->debugfs_show_mqd = debugfs_show_mqd;
 #endif