Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9b5dce5 authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915: Add some extra guards in evict_vm 



v2: Use WARN_ONs (Daniel)

Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarMichel Thierry <michel.thierry@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 7838a63a

drivers/gpu/drm/i915/i915_gem_evict.c

+3 −0
Original line number Diff line number Diff line
@@ -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) {
@@ -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)