[PATCH] drm/msm/gem: Fix double resv lock aquire

Christian König christian.koenig at amd.com
Wed Jan 31 10:07:58 UTC 2024


Am 30.01.24 um 23:35 schrieb Rob Clark:
> From: Rob Clark <robdclark at chromium.org>
>
> Since commit 56e5abba8c3e ("dma-buf: Add unlocked variant of vmapping
> functions"), the resv lock is already held in the prime vmap path, so
> don't try to grab it again.
>
> Fixes: 56e5abba8c3e ("dma-buf: Add unlocked variant of vmapping functions")
> Signed-off-by: Rob Clark <robdclark at chromium.org>

Acked-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/msm/msm_gem_prime.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/msm/msm_gem_prime.c b/drivers/gpu/drm/msm/msm_gem_prime.c
> index 5f68e31a3e4e..8a27b57a5bea 100644
> --- a/drivers/gpu/drm/msm/msm_gem_prime.c
> +++ b/drivers/gpu/drm/msm/msm_gem_prime.c
> @@ -26,7 +26,7 @@ int msm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map)
>   {
>   	void *vaddr;
>   
> -	vaddr = msm_gem_get_vaddr(obj);
> +	vaddr = msm_gem_get_vaddr_locked(obj);
>   	if (IS_ERR(vaddr))
>   		return PTR_ERR(vaddr);
>   	iosys_map_set_vaddr(map, vaddr);



More information about the dri-devel mailing list