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

Commit bdc2eea4 authored by Chunming Zhou's avatar Chunming Zhou Committed by Alex Deucher
Browse files

drm/amd: reset hw count when reset job 



Means the hw ring is empty after gpu reset.

Signed-off-by: default avatarChunming Zhou <David1.Zhou@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cd437e37

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -393,6 +393,7 @@ void amd_sched_hw_job_reset(struct amd_gpu_scheduler *sched) 
			s_job->s_fence->parent = NULL;

			s_job->s_fence->parent = NULL;

		}

		}

	}

	}

	atomic_set(&sched->hw_rq_count, 0);

	spin_unlock(&sched->job_list_lock);

	spin_unlock(&sched->job_list_lock);

}

}
@@ -410,6 +411,8 @@ void amd_sched_job_recovery(struct amd_gpu_scheduler *sched) 
	list_for_each_entry(s_job, &sched->ring_mirror_list, node) {

	list_for_each_entry(s_job, &sched->ring_mirror_list, node) {

		struct amd_sched_fence *s_fence = s_job->s_fence;

		struct amd_sched_fence *s_fence = s_job->s_fence;

		struct fence *fence = sched->ops->run_job(s_job);

		struct fence *fence = sched->ops->run_job(s_job);



		atomic_inc(&sched->hw_rq_count);

		if (fence) {

		if (fence) {

			s_fence->parent = fence_get(fence);

			s_fence->parent = fence_get(fence);

			r = fence_add_callback(fence, &s_fence->cb,

			r = fence_add_callback(fence, &s_fence->cb,