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

Commit 096d1a3e authored by Felix Kuehling's avatar Felix Kuehling Committed by Oded Gabbay
Browse files

drm/amdkfd: Update queue_count before mapping queues 



map_queues_cpsch uses the queue_count to decide whether to upload
a new runlist. So update the counter before calling it.

Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
parent bfd5e378

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

+11 −9
Original line number Diff line number Diff line
@@ -408,6 +408,17 @@ static int update_queue(struct device_queue_manager *dqm, struct queue *q) 


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



	/*

	 * check active state vs. the previous state and modify

	 * counter accordingly. map_queues_cpsch uses the

	 * dqm->queue_count to determine whether a new runlist must be

	 * uploaded.

	 */

	if (q->properties.is_active && !prev_active)

		dqm->queue_count++;

	else if (!q->properties.is_active && prev_active)

		dqm->queue_count--;



	if (sched_policy != KFD_SCHED_POLICY_NO_HWS)

		retval = map_queues_cpsch(dqm);

	else if (sched_policy == KFD_SCHED_POLICY_NO_HWS &&
@@ -417,15 +428,6 @@ static int update_queue(struct device_queue_manager *dqm, struct queue *q) 
		retval = mqd->load_mqd(mqd, q->mqd, q->pipe, q->queue,

				       &q->properties, q->process->mm);



	/*

	 * check active state vs. the previous state

	 * and modify counter accordingly

	 */

	if (q->properties.is_active && !prev_active)

		dqm->queue_count++;

	else if (!q->properties.is_active && prev_active)

		dqm->queue_count--;



out_unlock:

	mutex_unlock(&dqm->lock);

	return retval;