Commit 03facb39 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm/gem: Fix double resv lock aquire 



Since commit 79e2cf2e ("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: 79e2cf2e ("drm/gem: Take reservation lock for vmap/vunmap operations")
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Patchwork: https://patchwork.freedesktop.org/patch/576642/
parent 8d352171

drivers/gpu/drm/msm/msm_gem_prime.c

+2 −2
Original line number Diff line number Diff line
@@ -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,