summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2018-09-03 10:51:51 +0200
committerAlex Deucher <alexander.deucher@amd.com>2018-09-10 22:40:24 -0500
commit0a53b69cce846b42adf03ccee49ae0a37a731c20 (patch)
tree99fe98c5a834c05ebae51b74b76c9b5374541551 /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
parentc12a2ee5d002e39a387001cdb5065b560568b4f5 (diff)
downloadlinux-0a53b69cce846b42adf03ccee49ae0a37a731c20.tar.gz
linux-0a53b69cce846b42adf03ccee49ae0a37a731c20.tar.bz2
linux-0a53b69cce846b42adf03ccee49ae0a37a731c20.zip
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.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,
error_abort:
dma_fence_put(&job->base.s_fence->finished);
job->base.s_fence = NULL;
+ amdgpu_mn_unlock(p->mn);
error_unlock:
amdgpu_job_free(job);
- amdgpu_mn_unlock(p->mn);
return r;
}