Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b46cb7d7 authored by Yong Zhao's avatar Yong Zhao Committed by Oded Gabbay
Browse files

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



Signed-off-by: default avatarYong Zhao <yong.zhao@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
parent d7b9bd22

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c

+3 −10
Original line number Diff line number Diff line
@@ -149,8 +149,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;
@@ -170,7 +169,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;



	q->properties.tba_addr = qpd->tba_addr;
@@ -184,10 +182,8 @@ 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;

	}
@@ -812,16 +808,13 @@ static void destroy_kernel_queue_cpsch(struct device_queue_manager *dqm, 
}



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) {

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h

+1 −2
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c

+2 −4
Original line number Diff line number Diff line
@@ -201,8 +201,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;
@@ -222,8 +221,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;