drm/amdkfd: Compress unnecessary function parameters

Signed-off-by: Yong Zhao <yong.zhao@amd.com>
Reviewed-by: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index 660b3fbade4194f796ebe0be8e4fc7f7e9c46109..0ef82b2297546bd045809ec086f67ee647f20b88 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -282,8 +282,7 @@ static int kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p,
                        p->pasid,
                        dev->id);
 
-       err = pqm_create_queue(&p->pqm, dev, filep, &q_properties,
-                               0, q_properties.type, &queue_id);
+       err = pqm_create_queue(&p->pqm, dev, filep, &q_properties, &queue_id);
        if (err != 0)
                goto err_create_queue;
 

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c b/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c
index 7d5635fdd6e7af4cc1ac9efdc1dcc26714dbe8d7..c407f6bd99565c9e4d7c7147a65cdfa8c41417b8 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c
@@ -184,9 +184,10 @@ static int dbgdev_register_diq(struct kfd_dbgdev *dbgdev)
        struct kernel_queue *kq = NULL;
        int status;
 
+       properties.type = KFD_QUEUE_TYPE_DIQ;
+
        status = pqm_create_queue(dbgdev->pqm, dbgdev->dev, NULL,
-                               &properties, 0, KFD_QUEUE_TYPE_DIQ,
-                               &qid);
+                               &properties, &qid);
 
        if (status) {
                pr_err("Failed to create DIQ\n");

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index 2e13f5d46d2561d444e87714cb040ab24e742f84..7f141730de41d55cae365dedea64dc3f91c80cec 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -677,8 +677,6 @@ int pqm_create_queue(struct process_queue_manager *pqm,
                            struct kfd_dev *dev,
                            struct file *f,
                            struct queue_properties *properties,
-                           unsigned int flags,
-                           enum kfd_queue_type type,
                            unsigned int *qid);
 int pqm_destroy_queue(struct process_queue_manager *pqm, unsigned int qid);
 int pqm_update_queue(struct process_queue_manager *pqm, unsigned int qid,

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 31ec3ca9d46d49b97564ab128b57cd662f6cb231..63c569b62cee1013098e9039ae05a68fe05f3f3d 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
@@ -142,20 +142,17 @@ int pqm_create_queue(struct process_queue_manager *pqm,
                            struct kfd_dev *dev,
                            struct file *f,
                            struct queue_properties *properties,
-                           unsigned int flags,
-                           enum kfd_queue_type type,
                            unsigned int *qid)
 {
        int retval;
        struct kfd_process_device *pdd;
-       struct queue_properties q_properties;
        struct queue *q;
        struct process_queue_node *pqn;
        struct kernel_queue *kq;
        int num_queues = 0;
        struct queue *cur;
+       enum kfd_queue_type type = properties->type;
 
-       memcpy(&q_properties, properties, sizeof(struct queue_properties));
        q = NULL;
        kq = NULL;
 
@@ -206,7 +203,7 @@ int pqm_create_queue(struct process_queue_manager *pqm,
                        goto err_create_queue;
                }
 
-               retval = create_cp_queue(pqm, dev, &q, &q_properties, f, *qid);
+               retval = create_cp_queue(pqm, dev, &q, properties, f, *qid);
                if (retval != 0)
                        goto err_create_queue;
                pqn->q = q;
@@ -243,9 +240,8 @@ int pqm_create_queue(struct process_queue_manager *pqm,
        list_add(&pqn->process_queue_list, &pqm->queues);
 
        if (q) {
-               *properties = q->properties;
                pr_debug("PQM done creating queue\n");
-               print_queue_properties(properties);
+               print_queue_properties(&q->properties);
        }
 
        return retval;