Skip to contentSkip to conversation

drm/msm/gem: Fix double resv lock aquire

PATCH Superseded Rob Clark 2 participants 2 messages Jan 30, 2024 – Jan 31, 2024

Subsystems (3)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Rob Clark

author
#0 lore raw

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")
---
 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
index 5f68e31a3e4e..8a27b57a5bea 100644
@@ -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
Acked-by on v1 1/1
#1 lore raw

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")
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
index 5f68e31a3e4e..8a27b57a5bea 100644
@@ -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);