[PATCH 13/27] drm/amdkfd: Move sdma_queue_id calculation into allocate_sdma_queue()

[Kuehling, Felix]

From: Yong Zhao <yong.z...@amd.com>

This avoids duplicated code.

Signed-off-by: Yong Zhao <yong.z...@amd.com>
Reviewed-by: Felix Kuehling <felix.kuehl...@amd.com>
Signed-off-by: Felix Kuehling <felix.kuehl...@amd.com>
---
 .../drm/amd/amdkfd/kfd_device_queue_manager.c | 29 +++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)

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 e2de246d681b..38c66b8ffd31 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -883,7 +883,7 @@ static int stop_nocpsch(struct device_queue_manager *dqm)
 }
 
 static int allocate_sdma_queue(struct device_queue_manager *dqm,
-                               unsigned int *sdma_id)
+                               struct queue *q)
 {
        int bit;
 
@@ -892,7 +892,14 @@ static int allocate_sdma_queue(struct device_queue_manager 
*dqm,
 
        bit = __ffs64(dqm->sdma_bitmap);
        dqm->sdma_bitmap &= ~(1ULL << bit);
-       *sdma_id = bit;
+       q->sdma_id = bit;
+
+       q->properties.sdma_engine_id = q->sdma_id % get_num_sdma_engines(dqm);
+       q->properties.sdma_queue_id = q->sdma_id / get_num_sdma_engines(dqm);
+
+       pr_debug("SDMA id is:    %d\n", q->sdma_id);
+       pr_debug("SDMA engine id: %d\n", q->properties.sdma_engine_id);
+       pr_debug("SDMA queue id: %d\n", q->properties.sdma_queue_id);
 
        return 0;
 }
@@ -914,21 +921,14 @@ static int create_sdma_queue_nocpsch(struct 
device_queue_manager *dqm,
 
        mqd_mgr = dqm->mqd_mgrs[KFD_MQD_TYPE_SDMA];
 
-       retval = allocate_sdma_queue(dqm, &q->sdma_id);
+       retval = allocate_sdma_queue(dqm, q);
        if (retval)
                return retval;
 
-       q->properties.sdma_queue_id = q->sdma_id / get_num_sdma_engines(dqm);
-       q->properties.sdma_engine_id = q->sdma_id % get_num_sdma_engines(dqm);
-
        retval = allocate_doorbell(qpd, q);
        if (retval)
                goto out_deallocate_sdma_queue;
 
-       pr_debug("SDMA id is:    %d\n", q->sdma_id);
-       pr_debug("SDMA queue id: %d\n", q->properties.sdma_queue_id);
-       pr_debug("SDMA engine id: %d\n", q->properties.sdma_engine_id);
-
        dqm->asic_ops.init_sdma_vm(dqm, q, qpd);
        retval = mqd_mgr->init_mqd(mqd_mgr, &q->mqd, &q->mqd_mem_obj,
                                &q->gart_mqd_addr, &q->properties);
@@ -1129,16 +1129,9 @@ static int create_queue_cpsch(struct 
device_queue_manager *dqm, struct queue *q,
        }
 
        if (q->properties.type == KFD_QUEUE_TYPE_SDMA) {
-               retval = allocate_sdma_queue(dqm, &q->sdma_id);
+               retval = allocate_sdma_queue(dqm, q);
                if (retval)
                        goto out;
-               q->properties.sdma_queue_id =
-                       q->sdma_id / get_num_sdma_engines(dqm);
-               q->properties.sdma_engine_id =
-                       q->sdma_id % get_num_sdma_engines(dqm);
-               pr_debug("SDMA id is:    %d\n", q->sdma_id);
-               pr_debug("SDMA queue id: %d\n", q->properties.sdma_queue_id);
-               pr_debug("SDMA engine id: %d\n", q->properties.sdma_engine_id);
        }
 
        retval = allocate_doorbell(qpd, q);
-- 
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx