diff options
author | Rob Clark <robdclark@chromium.org> | 2022-06-13 13:50:32 -0700 |
---|---|---|
committer | Rob Clark <robdclark@chromium.org> | 2022-07-06 18:54:41 -0700 |
commit | a414fe3a2129b490e1e9b8ad66f0364f4f961887 (patch) | |
tree | dc89d856d99e9f391a49e88dee1848bcfd3f9f98 /drivers/gpu/drm/msm/msm_gem.c | |
parent | ff46c2c481f2a379c457f2a815afdd6819521cc0 (diff) | |
download | linux-stable-a414fe3a2129b490e1e9b8ad66f0364f4f961887.tar.gz linux-stable-a414fe3a2129b490e1e9b8ad66f0364f4f961887.tar.bz2 linux-stable-a414fe3a2129b490e1e9b8ad66f0364f4f961887.zip |
drm/msm/gem: Drop obj lock in msm_gem_free_object()
The only reason we grabbed the lock was to satisfy a bunch of places
that WARN_ON() if called without the lock held. But this angers lockdep
which doesn't realize no one else can be holding the lock by the time we
end up destroying the object (and sees what would otherwise be a locking
inversion between reservation_ww_class_mutex and fs_reclaim).
Closes: https://gitlab.freedesktop.org/drm/msm/-/issues/14
Signed-off-by: Rob Clark <robdclark@chromium.org>
Patchwork: https://patchwork.freedesktop.org/patch/489364/
Link: https://lore.kernel.org/r/20220613205032.2652374-1-robdclark@gmail.com
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gem.c')
-rw-r--r-- | drivers/gpu/drm/msm/msm_gem.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 5514aca98dd0..520e4b7b812e 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -1020,8 +1020,6 @@ static void msm_gem_free_object(struct drm_gem_object *obj) list_del(&msm_obj->mm_list); mutex_unlock(&priv->mm_lock); - msm_gem_lock(obj); - /* object should not be on active list: */ GEM_WARN_ON(is_active(msm_obj)); @@ -1037,17 +1035,11 @@ static void msm_gem_free_object(struct drm_gem_object *obj) put_iova_vmas(obj); - /* dma_buf_detach() grabs resv lock, so we need to unlock - * prior to drm_prime_gem_destroy - */ - msm_gem_unlock(obj); - drm_prime_gem_destroy(obj, msm_obj->sgt); } else { msm_gem_vunmap(obj); put_pages(obj); put_iova_vmas(obj); - msm_gem_unlock(obj); } drm_gem_object_release(obj); |