summarylogtreecommitdiffstats
path: root/0011-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch
diff options
context:
space:
mode:
Diffstat (limited to '0011-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch')
-rw-r--r--0011-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/0011-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch b/0011-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch
new file mode 100644
index 00000000000..9e52b9321dd
--- /dev/null
+++ b/0011-drm-i915-gem-Reinitialise-the-local-list-before-repe.patch
@@ -0,0 +1,34 @@
+From 52bc26b084be047fbc485f711dc2b88c0a1b2923 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 11/14] 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.25.0
+