Commit b4d329c4 authored by Rob Clark's avatar Rob Clark

drm/msm/gem: Drop early returns in close/purge vma

Keep the warn, but drop the early return.  If we do manage to hit this
sort of issue, skipping the cleanup just makes things worse (dangling
drm_mm_nodes when the msm_gem_vma is freed, etc).  Whereas the worst
that happens if we tear down a mapping the GPU is accessing is that we
get GPU iova faults, but otherwise the world keeps spinning.
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Tested-by: default avatarSteev Klimaszewski <steev@kali.org>
Reported-by: default avatarSteev Klimaszewski <steev@kali.org>
Patchwork: https://patchwork.freedesktop.org/patch/489115/
Link: https://lore.kernel.org/r/20220610172055.2337977-1-robdclark@gmail.com
parent 311e03c2
...@@ -62,8 +62,7 @@ void msm_gem_purge_vma(struct msm_gem_address_space *aspace, ...@@ -62,8 +62,7 @@ void msm_gem_purge_vma(struct msm_gem_address_space *aspace,
unsigned size = vma->node.size; unsigned size = vma->node.size;
/* Print a message if we try to purge a vma in use */ /* Print a message if we try to purge a vma in use */
if (GEM_WARN_ON(msm_gem_vma_inuse(vma))) GEM_WARN_ON(msm_gem_vma_inuse(vma));
return;
/* Don't do anything if the memory isn't mapped */ /* Don't do anything if the memory isn't mapped */
if (!vma->mapped) if (!vma->mapped)
...@@ -128,8 +127,7 @@ msm_gem_map_vma(struct msm_gem_address_space *aspace, ...@@ -128,8 +127,7 @@ msm_gem_map_vma(struct msm_gem_address_space *aspace,
void msm_gem_close_vma(struct msm_gem_address_space *aspace, void msm_gem_close_vma(struct msm_gem_address_space *aspace,
struct msm_gem_vma *vma) struct msm_gem_vma *vma)
{ {
if (GEM_WARN_ON(msm_gem_vma_inuse(vma) || vma->mapped)) GEM_WARN_ON(msm_gem_vma_inuse(vma) || vma->mapped);
return;
spin_lock(&aspace->lock); spin_lock(&aspace->lock);
if (vma->iova) if (vma->iova)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment