diff options
| author |   Rob Clark <robdclark@chromium.org> | 2022-04-11 14:58:38 -0700 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2022-04-21 15:03:12 -0700 |
| commit | 95d1deb02a9c93bf9ea8cebe61f0c26cadf43cf9 (patch) | |
| tree | 7e87b1a6478db525016fa59d60c886a124e19d70 /drivers/gpu/drm/msm/msm_gem.c | |
| parent | drm/msm/gem: Split vma lookup and pin (diff) | |
| download | linux-dev-95d1deb02a9c93bf9ea8cebe61f0c26cadf43cf9.tar.xz linux-dev-95d1deb02a9c93bf9ea8cebe61f0c26cadf43cf9.zip | |
drm/msm/gem: Add fenced vma unpin
With userspace allocated iova (next patch), we can have a race condition
where userspace observes the fence completion and deletes the vma before
retire_submit() gets around to unpinning the vma. To handle this, add a
fenced unpin which drops the refcount but tracks the fence, and update
msm_gem_vma_inuse() to check any previously unsignaled fences.
v2: Fix inuse underflow (duplicate unpin)
v3: Fix msm_job_run() vs submit_cleanup() race condition
Signed-off-by: Rob Clark <robdclark@chromium.org>
Link: https://lore.kernel.org/r/20220411215849.297838-10-robdclark@gmail.com
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gem.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index b31c4a374917..21986c321458 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -445,7 +445,7 @@ void msm_gem_unpin_vma_locked(struct drm_gem_object *obj, struct msm_gem_vma *vm GEM_WARN_ON(!msm_gem_is_locked(obj)); - msm_gem_unmap_vma(vma->aspace, vma); + msm_gem_unpin_vma(vma); msm_obj->pin_count--; GEM_WARN_ON(msm_obj->pin_count < 0); |