diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-27 21:28:30 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 21:51:30 -0700 |
| commit | ac9f371955a1d6ce27b1464a86137b4cdb0f43d8 (patch) | |
| tree | 8b1cc779dfe2a8f32edbc7ece65f77c0ca985bee /include | |
| parent | 39a3fcd46e669818b54dd9f587f11a40ccdbebe2 (diff) | |
| download | linux-stable-ac9f371955a1d6ce27b1464a86137b4cdb0f43d8.tar.gz linux-stable-ac9f371955a1d6ce27b1464a86137b4cdb0f43d8.tar.bz2 linux-stable-ac9f371955a1d6ce27b1464a86137b4cdb0f43d8.zip | |
drm: Prune GEM vma entries
commit 31dfbc93923c0aaa0440b809f80ff2830c6a531a upstream.
Hook the GEM vm open/close ops into the generic drm vm open/close so
that the private vma entries are created and destroy appropriately.
Fixes the leak of the drm_vma_entries during the lifetime of the filp.
Reported-by: Matt Mackall <mpm@selenic.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drmP.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index c1b987158dfa..1bebb043776a 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1149,6 +1149,7 @@ extern int drm_release(struct inode *inode, struct file *filp); extern int drm_mmap(struct file *filp, struct vm_area_struct *vma); extern int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma); extern void drm_vm_open_locked(struct vm_area_struct *vma); +extern void drm_vm_close_locked(struct vm_area_struct *vma); extern resource_size_t drm_core_get_map_ofs(struct drm_local_map * map); extern resource_size_t drm_core_get_reg_ofs(struct drm_device *dev); extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait); |