diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-12-05 21:41:59 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-12-06 11:16:49 +0000 |
| commit | 77853186e547bda70d0df0cf2587fb4f7fc29a6b (patch) | |
| tree | 199b1083628f21d1355e46353f9f382d59222eb1 /drivers/gpu/drm/i915/i915_vma.c | |
| parent | d315fe8bde5cd052ab1e839d1f6c09919297c7a8 (diff) | |
| download | linux-stable-77853186e547bda70d0df0cf2587fb4f7fc29a6b.tar.gz linux-stable-77853186e547bda70d0df0cf2587fb4f7fc29a6b.tar.bz2 linux-stable-77853186e547bda70d0df0cf2587fb4f7fc29a6b.zip | |
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: aa5e4453dc05 ("drm/i915/gem: Try to flush pending unbind events")
References: 2850748ef876 ("drm/i915: Pull i915_vma_pin under the vm->mutex")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191205214159.829727-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_vma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_vma.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index 6db35b9dead8..9ca6664c190c 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -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; } |