Skip to content

Commit

Permalink
drm/i915: VM eviction only targets address space not physical pages
Browse files Browse the repository at this point in the history
During eviction, we are only considering how to free up space within the
current address space and not concerned with freeing up physical memory.
As such we need only skip nodes that pinned in the current VM and not
globally.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ben Widawsky <benjamin.widawsky@intel.com>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Chris Wilson authored and Daniel Vetter committed Jan 29, 2014
1 parent dada1a9 commit 3036537
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/gpu/drm/i915/i915_gem_evict.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
static bool
mark_free(struct i915_vma *vma, struct list_head *unwind)
{
/* Freeing up memory requires no VMAs are pinned */
if (i915_gem_obj_is_pinned(vma->obj))
if (vma->pin_count)
return false;

if (WARN_ON(!list_empty(&vma->exec_list)))
Expand Down

0 comments on commit 3036537

Please sign in to comment.