From: Pixel Ding Date: Wed, 25 Apr 2018 02:52:45 +0000 (-0400) Subject: drm/scheduler: don't update last scheduled fence in TDR X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5dd3f9efd4199f0d9e8244322934494ebd140dfd;p=linux.git drm/scheduler: don't update last scheduled fence in TDR The current sequence in scheduler thread is: 1. update last sched fence 2. job begin (adding to mirror list) 3. job finish (remove from mirror list) 4. back to 1 Since we update last sched prior to joining mirror list, the jobs in mirror list already pass the last sched fence. TDR just run the jobs in mirror list, so we should not update the last sched fences in TDR. Signed-off-by: Pixel Ding Reviewed-by: Monk Liu Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler.c b/drivers/gpu/drm/scheduler/gpu_scheduler.c index 088ff2b4e8fbb..1f1dd70125a7a 100644 --- a/drivers/gpu/drm/scheduler/gpu_scheduler.c +++ b/drivers/gpu/drm/scheduler/gpu_scheduler.c @@ -575,9 +575,6 @@ void drm_sched_job_recovery(struct drm_gpu_scheduler *sched) fence = sched->ops->run_job(s_job); atomic_inc(&sched->hw_rq_count); - dma_fence_put(s_job->entity->last_scheduled); - s_job->entity->last_scheduled = dma_fence_get(&s_fence->finished); - if (fence) { s_fence->parent = dma_fence_get(fence); r = dma_fence_add_callback(fence, &s_fence->cb,