drm/msm/gem: Fix double resv lock aquire

robclark · robclark · commit 03facb39d6c6 · 2024-02-01T14:59:35.000-08:00
Since commit 79e2cf2 ("drm/gem: Take reservation lock for vmap/vunmap operations"), the resv lock is already held in the prime vmap path, so don't try to grab it again. v2: This applies to vunmap path as well v3: Fix fixes commit Fixes: 79e2cf2 ("drm/gem: Take reservation lock for vmap/vunmap operations") Signed-off-by: Rob Clark <robdclark@chromium.org> Acked-by: Christian König <christian.koenig@amd.com> Patchwork: https://patchwork.freedesktop.org/patch/576642/
diff --git 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);
@@ -36,7 +36,7 @@ int msm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map)
 
 void msm_gem_prime_vunmap(struct drm_gem_object *obj, struct iosys_map *map)
 {
-	msm_gem_put_vaddr(obj);
+	msm_gem_put_vaddr_locked(obj);
 }
 
 struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev,

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ int msm_gem_prime_vmap(struct drm_gem_object obj, struct iosys_map map)`
`26`	`26`	`{`
`27`	`27`	`void *vaddr;`
`28`	`28`
`29`		`- vaddr = msm_gem_get_vaddr(obj);`
	`29`	`+ vaddr = msm_gem_get_vaddr_locked(obj);`
`30`	`30`	`if (IS_ERR(vaddr))`
`31`	`31`	`return PTR_ERR(vaddr);`
`32`	`32`	`iosys_map_set_vaddr(map, vaddr);`
`@@ -36,7 +36,7 @@ int msm_gem_prime_vmap(struct drm_gem_object obj, struct iosys_map map)`
`36`	`36`
`37`	`37`	`void msm_gem_prime_vunmap(struct drm_gem_object obj, struct iosys_map map)`
`38`	`38`	`{`
`39`		`- msm_gem_put_vaddr(obj);`
	`39`	`+ msm_gem_put_vaddr_locked(obj);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`struct drm_gem_object msm_gem_prime_import_sg_table(struct drm_device dev,`