diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-11-12 06:06:37 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-11-12 06:06:41 +0300 |
| commit | b6c24725249a6c1a889665d720cdff088f686f98 (patch) | |
| tree | 68865fe0a2e4b93cf75aa51a45b466873bba3a81 /drivers/gpu/drm/drm_prime.c | |
| parent | 447212bb4f8ebd7d95dd6e160cd82c69c9a23c4c (diff) | |
| parent | 7120a447c7fe37a123ab7a63afefdbf0787b9002 (diff) | |
| download | linux-b6c24725249a6c1a889665d720cdff088f686f98.tar.xz | |
Merge tag 'drm-misc-fixes-2021-11-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
* dma-buf: name_lock fixes
* prime: Keep object ref during mmap
* nouveau: Fix a refcount issue; Fix device removal; Protect client
list with dedicated mutex; Fix address CE0 address calculation
* ttm: Fix race condition during BO eviction
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YYzY6jeox9EeI15i@linux-uq9g.fritz.box
Diffstat (limited to 'drivers/gpu/drm/drm_prime.c')
| -rw-r--r-- | drivers/gpu/drm/drm_prime.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index deb23dbec8b5..d6c7f4f9a7a2 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -719,11 +719,13 @@ int drm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) if (obj->funcs && obj->funcs->mmap) { vma->vm_ops = obj->funcs->vm_ops; + drm_gem_object_get(obj); ret = obj->funcs->mmap(obj, vma); - if (ret) + if (ret) { + drm_gem_object_put(obj); return ret; + } vma->vm_private_data = obj; - drm_gem_object_get(obj); return 0; } |