drm/msm/gem: Fix double resv lock aquire
PATCH v3 1/1 drm/msm/gem: Fix double resv lock aquire
From: Rob Clark <[email protected]>
Since commit 79e2cf2e7a19 ("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 79e2cf2e7a19 ("drm/gem: Take reservation lock for vmap/vunmap operations")
Signed-off-by Rob Clark <[email protected]>
Acked-by Christian König <[email protected]>
--- drivers/gpu/drm/msm/msm_gem_prime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/msm_gem_prime.c +2 -2
@@ -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,
Signature · 1 line
2.43.0