diff options
Diffstat (limited to 'kernels/linux-libre-xtreme/0008-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch')
-rw-r--r-- | kernels/linux-libre-xtreme/0008-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/kernels/linux-libre-xtreme/0008-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch b/kernels/linux-libre-xtreme/0008-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch new file mode 100644 index 000000000..f6311e266 --- /dev/null +++ b/kernels/linux-libre-xtreme/0008-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch @@ -0,0 +1,34 @@ +From 442f9ca36769ea043af37729382044afd7f18676 Mon Sep 17 00:00:00 2001 +From: Chris Wilson <chris@chris-wilson.co.uk> +Date: Thu, 5 Dec 2019 13:29:12 +0000 +Subject: [PATCH 08/11] drm/i915/gem: Reinitialise the local list before + repeating + +As we may start the loop again, we require our local list of i915_vma +we've processed to be reinitialised. + +Fixes: aa5e4453dc05 ("drm/i915/gem: Try to flush pending unbind events") +Closes: https://gitlab.freedesktop.org/drm/intel/issues/731 +Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> +Reviewed-by: Andi Shyti <andi.shyti@intel.com> +Link: https://patchwork.freedesktop.org/patch/msgid/20191205132912.606868-1-chris@chris-wilson.co.uk +--- + drivers/gpu/drm/i915/i915_gem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c +index 85b12228c2cf..c2c025c4f4ad 100644 +--- a/drivers/gpu/drm/i915/i915_gem.c ++++ b/drivers/gpu/drm/i915/i915_gem.c +@@ -174,7 +174,7 @@ int i915_gem_object_unbind(struct drm_i915_gem_object *obj, + i915_vm_close(vm); + spin_lock(&obj->vma.lock); + } +- list_splice(&still_in_list, &obj->vma.list); ++ list_splice_init(&still_in_list, &obj->vma.list); + spin_unlock(&obj->vma.lock); + + if (ret == -EAGAIN && flags & I915_GEM_OBJECT_UNBIND_ACTIVE) { +-- +2.26.0 + |