diff options
author | Christian König <christian.koenig@amd.com> | 2016-06-30 04:52:03 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-07-07 15:06:11 -0400 |
commit | 595a9cd68c132e474ee5daf97067d4d15c618739 (patch) | |
tree | bd49bec6ea57e468e347020f9884ae36f1dacea6 /drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | |
parent | a5fb4ec29c74a16ce1c269e52bc85ca86ee41e81 (diff) |
drm/amdgpu: remove fence parameter from amd_sched_job_init
We return the fence as part of the job structur anyway,
no need to do this twice.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_job.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index cdcfda6618d0..327f4df55c86 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | |||
@@ -113,20 +113,19 @@ int amdgpu_job_submit(struct amdgpu_job *job, struct amdgpu_ring *ring, | |||
113 | struct amd_sched_entity *entity, void *owner, | 113 | struct amd_sched_entity *entity, void *owner, |
114 | struct fence **f) | 114 | struct fence **f) |
115 | { | 115 | { |
116 | struct fence *fence; | ||
117 | int r; | 116 | int r; |
118 | job->ring = ring; | 117 | job->ring = ring; |
119 | 118 | ||
120 | if (!f) | 119 | if (!f) |
121 | return -EINVAL; | 120 | return -EINVAL; |
122 | 121 | ||
123 | r = amd_sched_job_init(&job->base, &ring->sched, entity, owner, &fence); | 122 | r = amd_sched_job_init(&job->base, &ring->sched, entity, owner); |
124 | if (r) | 123 | if (r) |
125 | return r; | 124 | return r; |
126 | 125 | ||
127 | job->owner = owner; | 126 | job->owner = owner; |
128 | job->ctx = entity->fence_context; | 127 | job->ctx = entity->fence_context; |
129 | *f = fence_get(fence); | 128 | *f = fence_get(&job->base.s_fence->finished); |
130 | amdgpu_job_free_resources(job); | 129 | amdgpu_job_free_resources(job); |
131 | amd_sched_entity_push_job(&job->base); | 130 | amd_sched_entity_push_job(&job->base); |
132 | 131 | ||