drm/msm/gem: Fix double resv lock aquire
PATCH 1/1 drm/msm/gem: Fix double resv lock aquire
From: Rob Clark <[email protected]>
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 <[email protected]>
--- drivers/gpu/drm/msm/msm_gem_prime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_gem_prime.c +1 -1
@@ -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);
Signature · 1 line
2.43.0
Am 30.01.24 um 23:35 schrieb Rob Clark:
Quoted 8 lines
From: Rob Clark <[email protected]>
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 <[email protected]>
Acked-by Christian König <[email protected]>
Quoted 17 lines
--- drivers/gpu/drm/msm/msm_gem_prime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/msm/msm_gem_prime.c +1
-1@@ -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);