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

Commit 2533f074 authored by Shaoyun Liu's avatar Shaoyun Liu Committed by Oded Gabbay
Browse files

drm/amdkfd: Remove queue node when destroy queue failed 



HWS may hang in the middle of destroy queue, remove the queue from the
process queue list so it won't be freed again in the future

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

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

+7 −3
Original line number Diff line number Diff line
@@ -241,7 +241,8 @@ int pqm_create_queue(struct process_queue_manager *pqm, 
	}



	if (retval != 0) {

		pr_err("DQM create queue failed\n");

		pr_err("Pasid %d DQM create queue %d failed. ret %d\n",

			pqm->process->pasid, type, retval);

		goto err_create_queue;

	}
@@ -319,7 +320,10 @@ int pqm_destroy_queue(struct process_queue_manager *pqm, unsigned int qid) 
		dqm = pqn->q->device->dqm;

		retval = dqm->ops.destroy_queue(dqm, &pdd->qpd, pqn->q);

		if (retval) {

			pr_debug("Destroy queue failed, returned %d\n", retval);

			pr_err("Pasid %d destroy queue %d failed, ret %d\n",

				pqm->process->pasid,

				pqn->q->properties.queue_id, retval);

			if (retval != -ETIME)

				goto err_destroy_queue;

		}

		uninit_queue(pqn->q);