Commit 77853186 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Claim vma while under closed_lock in i915_vma_parked()



Remove the vma we wish to destroy from the gt->closed_list to avoid
having two i915_vma_parked() try and free it.

Fixes: aa5e4453 ("drm/i915/gem: Try to flush pending unbind events")
References: 2850748e ("drm/i915: Pull i915_vma_pin under the vm->mutex")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191205214159.829727-1-chris@chris-wilson.co.uk
parent d315fe8b
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -1053,7 +1053,9 @@ void i915_vma_parked(struct intel_gt *gt)
		if (!kref_get_unless_zero(&obj->base.refcount))
			continue;

		if (!i915_vm_tryopen(vm)) {
		if (i915_vm_tryopen(vm)) {
			list_del_init(&vma->closed_link);
		} else {
			i915_gem_object_put(obj);
			obj = NULL;
		}