[PATCH] drm/amdgpu: fix amdgpu_mn_unlock() in the CS error path

Zhang, Jerry (Junwei) Jerry.Zhang at amd.com
Mon Sep 3 09:03:36 UTC 2018


On 09/03/2018 04:53 PM, Christian König wrote:
> Avoid unlocking a lock we never locked.
>
> Signed-off-by: Christian König <christian.koenig at amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang at amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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;
>   }
>
>


More information about the amd-gfx mailing list