Skip to content

Commit

Permalink
drm/i915: Add some extra guards in evict_vm
Browse files Browse the repository at this point in the history
v2: Use WARN_ONs (Daniel)

Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Ben Widawsky authored and Daniel Vetter committed Jan 6, 2015
1 parent 7838a63 commit b9b5dce
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/gpu/drm/i915/i915_gem_evict.c
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ int i915_gem_evict_vm(struct i915_address_space *vm, bool do_idle)
struct i915_vma *vma, *next;
int ret;

WARN_ON(!mutex_is_locked(&vm->dev->struct_mutex));
trace_i915_gem_evict_vm(vm);

if (do_idle) {
Expand All @@ -222,6 +223,8 @@ int i915_gem_evict_vm(struct i915_address_space *vm, bool do_idle)
return ret;

i915_gem_retire_requests(vm->dev);

WARN_ON(!list_empty(&vm->active_list));
}

list_for_each_entry_safe(vma, next, &vm->inactive_list, mm_list)
Expand Down

0 comments on commit b9b5dce

Please sign in to comment.