drm/i915: Add some extra guards in evict_vm
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>
This commit is contained in:
parent
7838a63a53
commit
b9b5dce5e7
|
@ -214,6 +214,7 @@ int i915_gem_evict_vm(struct i915_address_space *vm, bool do_idle)
|
||||||
struct i915_vma *vma, *next;
|
struct i915_vma *vma, *next;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
WARN_ON(!mutex_is_locked(&vm->dev->struct_mutex));
|
||||||
trace_i915_gem_evict_vm(vm);
|
trace_i915_gem_evict_vm(vm);
|
||||||
|
|
||||||
if (do_idle) {
|
if (do_idle) {
|
||||||
|
@ -222,6 +223,8 @@ int i915_gem_evict_vm(struct i915_address_space *vm, bool do_idle)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
i915_gem_retire_requests(vm->dev);
|
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)
|
list_for_each_entry_safe(vma, next, &vm->inactive_list, mm_list)
|
||||||
|
|
Loading…
Reference in a new issue