summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
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-11 05:53:29 +0200
commitb463d4e53ca9bdbf227e19b477fbfcdedaa14c84 (patch)
tree9552837b9ed4767d51a073b7671d637b13e9fb28 /drivers/gpu
parentMerge tag 'drm-intel-fixes-2018-09-05' of git://anongit.freedesktop.org/drm/d... (diff)
downloadlinux-b463d4e53ca9bdbf227e19b477fbfcdedaa14c84.tar.xz
linux-b463d4e53ca9bdbf227e19b477fbfcdedaa14c84.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')
-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 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,
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;
}