UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: aa5e4453dc ("drm/i915/gem: Try to flush pending unbind events")
References: 2850748ef8 ("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
This commit is contained in:
Chris Wilson 2019-12-05 21:41:59 +00:00
parent d315fe8bde
commit 77853186e5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/i915_vma.c
View File

@ -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;
}