[PATCH] drm/amdgpu: unlock the correct lock in amdgpu_gfx_enable_kcq()

Alex Deucher alexdeucher at gmail.com
Wed May 3 15:33:58 UTC 2023


Applied.  Thanks!

On Wed, May 3, 2023 at 11:29 AM Dan Carpenter <dan.carpenter at linaro.org> wrote:
>
> We changed which lock we are supposed to take but this error path
> was accidentally over looked so it still drops the old lock.
>
> Fixes: def799c6596d ("drm/amdgpu: add multi-xcc support to amdgpu_gfx interfaces (v4)")
> Signed-off-by: Dan Carpenter <dan.carpenter at linaro.org>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> index 60bb4bba1994..1de3fffae9d7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> @@ -566,7 +566,7 @@ int amdgpu_gfx_enable_kcq(struct amdgpu_device *adev, int xcc_id)
>                                                 kiq->pmf->set_resources_size);
>                 if (r) {
>                         DRM_ERROR("Failed to lock KIQ (%d).\n", r);
> -                       spin_unlock(&adev->gfx.kiq[0].ring_lock);
> +                       spin_unlock(&kiq->ring_lock);
>                         return r;
>                 }
>
> --
> 2.39.2
>


More information about the amd-gfx mailing list