[PATCH] drm/amdkfd: Delete a useless parameter from create_queue function pointer

[Yong Zhao]

Change-Id: Ia5c74ad567c30e206ed804b204fdf8a0f8a75a19
Signed-off-by: Yong Zhao <yong.z...@amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  | 14 ++++----------
 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h  |  3 +--
 drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c |  3 +--
 3 files changed, 6 insertions(+), 14 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 53a66e8..1df1123 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -144,8 +144,7 @@ static void deallocate_vmid(struct device_queue_manager 
*dqm,
 
 static int create_queue_nocpsch(struct device_queue_manager *dqm,
                                struct queue *q,
-                               struct qcm_process_device *qpd,
-                               int *allocated_vmid)
+                               struct qcm_process_device *qpd)
 {
        int retval;
 
@@ -165,7 +164,6 @@ static int create_queue_nocpsch(struct device_queue_manager 
*dqm,
                if (retval)
                        goto out_unlock;
        }
-       *allocated_vmid = qpd->vmid;
        q->properties.vmid = qpd->vmid;
 
        if (q->properties.type == KFD_QUEUE_TYPE_COMPUTE)
@@ -176,10 +174,9 @@ static int create_queue_nocpsch(struct 
device_queue_manager *dqm,
                retval = -EINVAL;
 
        if (retval) {
-               if (list_empty(&qpd->queues_list)) {
+               if (list_empty(&qpd->queues_list))
                        deallocate_vmid(dqm, qpd, q);
-                       *allocated_vmid = 0;
-               }
+
                goto out_unlock;
        }
 
@@ -788,16 +785,13 @@ static void select_sdma_engine_id(struct queue *q)
 }
 
 static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue 
*q,
-                       struct qcm_process_device *qpd, int *allocate_vmid)
+                       struct qcm_process_device *qpd)
 {
        int retval;
        struct mqd_manager *mqd;
 
        retval = 0;
 
-       if (allocate_vmid)
-               *allocate_vmid = 0;
-
        mutex_lock(&dqm->lock);
 
        if (dqm->total_queue_count >= max_num_of_queues_per_device) {
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h 
b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
index faf820a..449407a 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
@@ -84,8 +84,7 @@ struct device_process_node {
 struct device_queue_manager_ops {
        int     (*create_queue)(struct device_queue_manager *dqm,
                                struct queue *q,
-                               struct qcm_process_device *qpd,
-                               int *allocate_vmid);
+                               struct qcm_process_device *qpd);
 
        int     (*destroy_queue)(struct device_queue_manager *dqm,
                                struct qcm_process_device *qpd,
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c 
b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
index 03bec76..1e7bcae 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
@@ -199,8 +199,7 @@ int pqm_create_queue(struct process_queue_manager *pqm,
                        goto err_create_queue;
                pqn->q = q;
                pqn->kq = NULL;
-               retval = dev->dqm->ops.create_queue(dev->dqm, q, &pdd->qpd,
-                                               &q->properties.vmid);
+               retval = dev->dqm->ops.create_queue(dev->dqm, q, &pdd->qpd);
                pr_debug("DQM returned %d for create_queue\n", retval);
                print_queue(q);
                break;
-- 
2.7.4

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