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

Commit b6ffbab8 authored by Oded Gabbay's avatar Oded Gabbay
Browse files

amdkfd: Fix accounting of device queues 



This patch fixes a device QCM bug, where the number of queues were not
counted correctly for the operation of update queue. The count was incorrect
as there was no regard to the previous state of the queue.

Signed-off-by: default avatarOded Gabbay <oded.gabbay@amd.com>
parent b7392d22

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

+11 −2
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ static int update_queue(struct device_queue_manager *dqm, struct queue *q) 
{

	int retval;

	struct mqd_manager *mqd;

	bool prev_active = false;



	BUG_ON(!dqm || !q || !q->mqd);
@@ -330,10 +331,18 @@ static int update_queue(struct device_queue_manager *dqm, struct queue *q) 
		return -ENOMEM;

	}



	retval = mqd->update_mqd(mqd, q->mqd, &q->properties);

	if (q->properties.is_active == true)

		prev_active = true;



	/*

	 *

	 * check active state vs. the previous state

	 * and modify counter accordingly

	 */

	retval = mqd->update_mqd(mqd, q->mqd, &q->properties);

	if ((q->properties.is_active == true) && (prev_active == false))

		dqm->queue_count++;

	else

	else if ((q->properties.is_active == false) && (prev_active == true))

		dqm->queue_count--;



	if (sched_policy != KFD_SCHED_POLICY_NO_HWS)