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

Commit c9450127 authored by Alex Deucher's avatar Alex Deucher
Browse files

Revert "drm/amdgpu: discard commands of killed processes" 



This causes instability in piglit.  It's fixed in drm-next with:
515c6faf
1650c14b
214a91e6
29d25355
79867462

This reverts commit 6af0883e.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2de03073

drivers/gpu/drm/amd/scheduler/gpu_scheduler.c

+4 −19
Original line number Diff line number Diff line
@@ -205,32 +205,17 @@ void amd_sched_entity_fini(struct amd_gpu_scheduler *sched, 
			   struct amd_sched_entity *entity)

{

	struct amd_sched_rq *rq = entity->rq;

	int r;



	if (!amd_sched_entity_is_initialized(sched, entity))

		return;



	/**

	 * The client will not queue more IBs during this fini, consume existing

	 * queued IBs or discard them on SIGKILL

	 * queued IBs

	*/

	if ((current->flags & PF_SIGNALED) && current->exit_code == SIGKILL)

		r = -ERESTARTSYS;

	else

		r = wait_event_killable(sched->job_scheduled,

					amd_sched_entity_is_idle(entity));

	amd_sched_rq_remove_entity(rq, entity);

	if (r) {

		struct amd_sched_job *job;

	wait_event(sched->job_scheduled, amd_sched_entity_is_idle(entity));



		/* Park the kernel for a moment to make sure it isn't processing

		 * our enity.

		 */

		kthread_park(sched->thread);

		kthread_unpark(sched->thread);

		while (kfifo_out(&entity->job_queue, &job, sizeof(job)))

			sched->ops->free_job(job);



	}

	amd_sched_rq_remove_entity(rq, entity);

	kfifo_free(&entity->job_queue);

}