summary refs log tree commit diff
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2015-11-06 14:09:21 +0100
committerAlex Deucher <alexander.deucher@amd.com>2015-11-16 11:05:58 -0500
commit4a562283376197722b295d27633134401bbc80f5 (patch)
treeeacbac9e5ddcfb7ab9b8d4bc4dbafc1df2dd0444
parent7034decf6a5b1ff778d83ff9d7ce1f0b404804e4 (diff)
downloadlinux-4a562283376197722b295d27633134401bbc80f5.tar.gz
drm/amdgpu: cleanup scheduler fence get/put dance
The code was correct, but getting two references when the ownership
is linearly moved on is a bit awkward and just overhead.

Signed: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c1
-rw-r--r--drivers/gpu/drm/amd/scheduler/gpu_scheduler.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
index 67f778f6eedb..8ef9e4415fcc 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
@@ -64,7 +64,6 @@ err:
 		job->free_job(job);
 
 	mutex_unlock(&job->job_lock);
-	fence_put(&job->base.s_fence->base);
 	kfree(job);
 	return fence ? &fence->base : NULL;
 }
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
index b8925fea577c..ccb7c1554f5e 100644
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
@@ -285,7 +285,6 @@ int amd_sched_entity_push_job(struct amd_sched_job *sched_job)
 	if (!fence)
 		return -ENOMEM;
 
-	fence_get(&fence->base);
 	sched_job->s_fence = fence;
 
 	wait_event(entity->sched->job_scheduled,