Am 30.06.2016 um 11:34 schrieb Chunming Zhou:
> amd_sched_hw_job_reset will remove callback from hw fence.
>
> Change-Id: I592153debad43cba3468504fe041ca439c0a5ec2
> Signed-off-by: Chunming Zhou <David1.Zhou at amd.com>
Reviewed-by: Christian König <christian.koenig at amd.com>
> ---
> drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 14 ++++++++++++++
> drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 1 +
> 2 files changed, 15 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
> index 717655d..cf2d64b 100644
> --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
> +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
> @@ -381,6 +381,20 @@ static void amd_sched_job_timedout(struct work_struct *work)
> job->sched->ops->timedout_job(job);
> }
>
> +void amd_sched_hw_job_reset(struct amd_gpu_scheduler *sched)
> +{
> + struct amd_sched_job *s_job;
> +
> + spin_lock(&sched->job_list_lock);
> + list_for_each_entry_reverse(s_job, &sched->ring_mirror_list, node) {
> + if (fence_remove_callback(s_job->s_fence->parent, &s_job->s_fence->cb)) {
> + fence_put(s_job->s_fence->parent);
> + s_job->s_fence->parent = NULL;
> + }
> + }
> + spin_unlock(&sched->job_list_lock);
> +}
> +
> /**
> * Submit a job to the job queue
> *
> diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
> index b027603..0924773 100644
> --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
> +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
> @@ -157,4 +157,5 @@ int amd_sched_job_init(struct amd_sched_job *job,
> struct amd_gpu_scheduler *sched,
> struct amd_sched_entity *entity,
> void *owner);
> +void amd_sched_hw_job_reset(struct amd_gpu_scheduler *sched);
> #endif
