aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2015-07-07 11:27:03 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-07-16 12:39:39 -0400
commit5c2327beed49efa3198b8468e78b1182eb0b764b (patch)
tree743d1bae4ecdab5c4782acd639e0fed485b63762 /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
parent76a1ea618f01b2bf5a325832d1c273c039c4ea81 (diff)
drm/amdgpu: stop context leak in the error path
Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 469b6f2364bc..1f040d85ac47 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -817,12 +817,16 @@ int amdgpu_cs_wait_ioctl(struct drm_device *dev, void *data,
817 817
818 r = amdgpu_cs_get_ring(adev, wait->in.ip_type, wait->in.ip_instance, 818 r = amdgpu_cs_get_ring(adev, wait->in.ip_type, wait->in.ip_instance,
819 wait->in.ring, &ring); 819 wait->in.ring, &ring);
820 if (r) 820 if (r) {
821 amdgpu_ctx_put(ctx);
821 return r; 822 return r;
823 }
822 824
823 r = amdgpu_fence_recreate(ring, filp, wait->in.handle, &fence); 825 r = amdgpu_fence_recreate(ring, filp, wait->in.handle, &fence);
824 if (r) 826 if (r) {
827 amdgpu_ctx_put(ctx);
825 return r; 828 return r;
829 }
826 830
827 r = fence_wait_timeout(&fence->base, true, timeout); 831 r = fence_wait_timeout(&fence->base, true, timeout);
828 amdgpu_fence_unref(&fence); 832 amdgpu_fence_unref(&fence);