Skip to contentSkip to conversation

drm/amd/scheduler:fix duplicate operation in entity fini

PATCH In review Monk Liu 2 participants 2 messages Oct 23, 2017 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

Monk Liu

author
#0 lore raw

PATCH 1/1 drm/amd/scheduler:fix duplicate operation in entity fini

no need to manually cleanup job and fence after sched_fence_finish(), they are auto handled by the callback

Change-Id I9da26064c9e73c178949663bed1e490539e95e41
---
 drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +1 -2
index 39b6205..f9f3daa 100644
@@ -230,11 +230,10 @@ void amd_sched_entity_fini(struct amd_gpu_scheduler *sched,
 		kthread_unpark(sched->thread);
 		while (kfifo_out(&entity->job_queue, &job, sizeof(job))) {
 			struct amd_sched_fence *s_fence = job->s_fence;
+
 			amd_sched_fence_scheduled(s_fence);
 			dma_fence_set_error(&s_fence->finished, -ESRCH);
 			amd_sched_fence_finished(s_fence);
-			dma_fence_put(&s_fence->finished);
-			sched->ops->free_job(job);
 		}
 
 	}
Signature · 6 lines
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1508738432-27426-1-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org

Reviewed-by
#2 lore raw

Am 23.10.2017 um 08:00 schrieb Monk Liu:

Quoted 5 lines

no need to manually cleanup job and fence after sched_fence_finish(), they are auto handled by the callback

Change-Id I9da26064c9e73c178949663bed1e490539e95e41
Quoted 11 lines
---
  drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +0 -0
index 39b6205..f9f3daa 100644
@@ -230,11 +230,10 @@ void amd_sched_entity_fini(struct amd_gpu_scheduler *sched,
  		kthread_unpark(sched->thread);
  		while (kfifo_out(&entity->job_queue, &job, sizeof(job))) {

drivers/gpu/drm/amd/scheduler/gpu_scheduler.c void amd_sched_entity_fini(struct amd_gpu_scheduler *sched, · line 239

Quoted 10 lines
drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +1 -2
  			struct amd_sched_fence *s_fence = job->s_fence;
+
  			amd_sched_fence_scheduled(s_fence);
  			dma_fence_set_error(&s_fence->finished, -ESRCH);
  			amd_sched_fence_finished(s_fence);
-			dma_fence_put(&s_fence->finished);
-			sched->ops->free_job(job);
  		}
 
  	}

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx