diff options
author | Christian König <christian.koenig@amd.com> | 2018-08-24 08:23:33 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-08-27 16:12:10 -0400 |
commit | 85eff20020a656b2d13b33dc4681523508fee037 (patch) | |
tree | 0f4f15282bfd5032a94f34ad8ee682a5e80cab69 /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |
parent | a9a8a788e5e946a9835a1365256fc4ce9e96ba2c (diff) |
drm/amdgpu: amdgpu_ctx_add_fence can't fail
No more waiting for a fence done here.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index b62bbe71662d..adc6a43e2333 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |||
@@ -1217,15 +1217,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, | |||
1217 | job->owner = p->filp; | 1217 | job->owner = p->filp; |
1218 | p->fence = dma_fence_get(&job->base.s_fence->finished); | 1218 | p->fence = dma_fence_get(&job->base.s_fence->finished); |
1219 | 1219 | ||
1220 | r = amdgpu_ctx_add_fence(p->ctx, entity, p->fence, &seq); | 1220 | amdgpu_ctx_add_fence(p->ctx, entity, p->fence, &seq); |
1221 | if (r) { | ||
1222 | dma_fence_put(p->fence); | ||
1223 | dma_fence_put(&job->base.s_fence->finished); | ||
1224 | amdgpu_job_free(job); | ||
1225 | amdgpu_mn_unlock(p->mn); | ||
1226 | return r; | ||
1227 | } | ||
1228 | |||
1229 | amdgpu_cs_post_dependencies(p); | 1221 | amdgpu_cs_post_dependencies(p); |
1230 | 1222 | ||
1231 | if ((job->preamble_status & AMDGPU_PREAMBLE_IB_PRESENT) && | 1223 | if ((job->preamble_status & AMDGPU_PREAMBLE_IB_PRESENT) && |