Skip to content

Commit

Permalink
drm/i915: Protect private gem objects from truncate (such as imported…
Browse files Browse the repository at this point in the history
… dmabuf)

If the object has no backing shmemfs filp, then we obviously cannot
perform a truncation operation upon it.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Chris Wilson authored and Daniel Vetter committed Aug 24, 2012
1 parent 86a1ee2 commit 4d6294b
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/gpu/drm/i915/i915_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -1385,6 +1385,11 @@ i915_gem_object_truncate(struct drm_i915_gem_object *obj)
{
struct inode *inode;

i915_gem_object_free_mmap_offset(obj);

if (obj->base.filp == NULL)
return;

/* Our goal here is to return as much of the memory as
* is possible back to the system as we are called from OOM.
* To do this we must instruct the shmfs to drop all of its
Expand All @@ -1393,8 +1398,6 @@ i915_gem_object_truncate(struct drm_i915_gem_object *obj)
inode = obj->base.filp->f_path.dentry->d_inode;
shmem_truncate_range(inode, 0, (loff_t)-1);

i915_gem_object_free_mmap_offset(obj);

obj->madv = __I915_MADV_PURGED;
}

Expand Down

0 comments on commit 4d6294b

Please sign in to comment.