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

Alex Deucher alexdeucher at gmail.com
Mon May 9 14:50:13 UTC 2022


Applied.  Thanks!

Alex

On Mon, May 9, 2022 at 5:09 AM Dan Carpenter <dan.carpenter at oracle.com> wrote:
>
> Add a missing amdgpu_bo_unreserve(ring->mqd_obj) to an error path in
> gfx_v11_0_kiq_resume().
>
> Fixes: 3d879e81f0f9 ("drm/amdgpu: add init support for GFX11 (v2)")
> Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> index 184bf554acca..92312f7c7f29 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> @@ -4312,8 +4312,10 @@ static int gfx_v11_0_kiq_resume(struct amdgpu_device *adev)
>                 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_v11_0_kiq_init_queue(ring);
>         amdgpu_bo_kunmap(ring->mqd_obj);
> --
> 2.35.1
>


More information about the amd-gfx mailing list