aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2018-09-03 04:51:51 -0400
committerAlex Deucher <alexander.deucher@amd.com>2018-09-10 23:40:24 -0400
commit0a53b69cce846b42adf03ccee49ae0a37a731c20 (patch)
tree99fe98c5a834c05ebae51b74b76c9b5374541551
parentc12a2ee5d002e39a387001cdb5065b560568b4f5 (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>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c2
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 349dcc37ee64..04a2733b5ccc 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -1247,10 +1247,10 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,
1247error_abort: 1247error_abort:
1248 dma_fence_put(&job->base.s_fence->finished); 1248 dma_fence_put(&job->base.s_fence->finished);
1249 job->base.s_fence = NULL; 1249 job->base.s_fence = NULL;
1250 amdgpu_mn_unlock(p->mn);
1250 1251
1251error_unlock: 1252error_unlock:
1252 amdgpu_job_free(job); 1253 amdgpu_job_free(job);
1253 amdgpu_mn_unlock(p->mn);
1254 return r; 1254 return r;
1255} 1255}
1256 1256