[PATCH] drm/amdgpu: unlock on error in gfx_v9_4_3_kiq_resume()

[Alex Deucher]

Applied.  Thanks!

Alex

On Wed, May 3, 2023 at 11:29 AM Dan Carpenter <dan.carpenter at linaro.org> wrote:
>
> Smatch complains that we need to drop this lock before returning.
>
>     drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c:1838 gfx_v9_4_3_kiq_resume()
>     warn: inconsistent returns 'ring->mqd_obj->tbo.base.resv'.
>
> Fixes: 86301129698b ("drm/amdgpu: split gc v9_4_3 functionality from gc v9_0")
> Signed-off-by: Dan Carpenter <dan.carpenter at linaro.org>
> ---
> The Fixes tag is weird, but I think it's correct?
>
>  drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
> index 56a415e151d4..552729a514d3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
> @@ -1827,8 +1827,10 @@ static int gfx_v9_4_3_kiq_resume(struct amdgpu_device *adev, int xcc_id)
>                 return r;
>
>         r = amdgpu_bo_kmap(ring->mqd_obj, (void **)&ring->mqd_ptr);
> -       if (unlikely(r != 0))
> +       if (unlikely(r != 0)) {
> +               amdgpu_bo_unreserve(ring->mqd_obj);
>                 return r;
> +       }
>
>         gfx_v9_4_3_kiq_init_queue(ring, xcc_id);
>         amdgpu_bo_kunmap(ring->mqd_obj);
> --
> 2.39.2
>