diff options
| author |   Rob Clark <robdclark@chromium.org> | 2022-06-28 15:41:29 -0700 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2022-06-28 15:41:29 -0700 |
| commit | 1796c0255bae9d3d4528b8b3916182b2bc4e1e71 (patch) | |
| tree | 474ecb1ef87ad1bd1d41c62737da924db224f4a2 /drivers/gpu/drm/msm/msm_gem.c | |
| parent | Linux 5.19-rc2 (diff) | |
| parent | drm/msm/gem: Fix error return on fence id alloc fail (diff) | |
| download | linux-dev-1796c0255bae9d3d4528b8b3916182b2bc4e1e71.tar.xz linux-dev-1796c0255bae9d3d4528b8b3916182b2bc4e1e71.zip | |
Merge tag 'drm-msm-fixes-2022-06-28' into msm-next-staging
Merge v5.19 fixes to avoid merge conflicts
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 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 97d5b4d8b9b0..7f92231785a0 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -439,14 +439,12 @@ int msm_gem_pin_vma_locked(struct drm_gem_object *obj, struct msm_gem_vma *vma) return ret; } -void msm_gem_unpin_vma_locked(struct drm_gem_object *obj, struct msm_gem_vma *vma) +void msm_gem_unpin_locked(struct drm_gem_object *obj) { struct msm_gem_object *msm_obj = to_msm_bo(obj); GEM_WARN_ON(!msm_gem_is_locked(obj)); - msm_gem_unpin_vma(vma); - msm_obj->pin_count--; GEM_WARN_ON(msm_obj->pin_count < 0); @@ -586,7 +584,8 @@ void msm_gem_unpin_iova(struct drm_gem_object *obj, msm_gem_lock(obj); vma = lookup_vma(obj, aspace); if (!GEM_WARN_ON(!vma)) { - msm_gem_unpin_vma_locked(obj, vma); + msm_gem_unpin_vma(vma); + msm_gem_unpin_locked(obj); } msm_gem_unlock(obj); } |