diff options
author | Christian König <christian.koenig@amd.com> | 2018-09-03 04:51:51 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-09-10 23:53:29 -0400 |
commit | b463d4e53ca9bdbf227e19b477fbfcdedaa14c84 (patch) | |
tree | 9552837b9ed4767d51a073b7671d637b13e9fb28 /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |
parent | 67c6ed7cf9ebe53815f15bfdeb49ad91801c2235 (diff) |
drm/amdgpu: fix amdgpu_mn_unlock() in the CS error path
Avoid unlocking a lock we never locked.
Signed-off-by: Christian König <christian.koenig@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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index b6e9df11115d..1b5a0a73d770 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |||
@@ -1262,10 +1262,10 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, | |||
1262 | error_abort: | 1262 | error_abort: |
1263 | dma_fence_put(&job->base.s_fence->finished); | 1263 | dma_fence_put(&job->base.s_fence->finished); |
1264 | job->base.s_fence = NULL; | 1264 | job->base.s_fence = NULL; |
1265 | amdgpu_mn_unlock(p->mn); | ||
1265 | 1266 | ||
1266 | error_unlock: | 1267 | error_unlock: |
1267 | amdgpu_job_free(job); | 1268 | amdgpu_job_free(job); |
1268 | amdgpu_mn_unlock(p->mn); | ||
1269 | return r; | 1269 | return r; |
1270 | } | 1270 | } |
1271 | 1271 | ||