diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2020-02-29 12:59:34 -0800 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2020-02-29 12:59:34 -0800 |
| commit | d41bd7edb6effc7952a5349f4bfbb55242ee6e3b (patch) | |
| tree | f2b52c35db8003e23a0ab23d3c206f56312b9e7e /0009-drm-i915-gem-Reinitialise-the-local-list-before-repeating.patch | |
| parent | Updated to 5.5.6 (diff) | |
| download | linux-ck-d41bd7edb6effc7952a5349f4bfbb55242ee6e3b.tar.xz | |
Updated to 5.5.7
Diffstat (limited to '0009-drm-i915-gem-Reinitialise-the-local-list-before-repeating.patch')
| -rw-r--r-- | 0009-drm-i915-gem-Reinitialise-the-local-list-before-repeating.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/0009-drm-i915-gem-Reinitialise-the-local-list-before-repeating.patch b/0009-drm-i915-gem-Reinitialise-the-local-list-before-repeating.patch new file mode 100644 index 0000000..2719884 --- /dev/null +++ b/0009-drm-i915-gem-Reinitialise-the-local-list-before-repeating.patch @@ -0,0 +1,33 @@ +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: 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 @@ err_vm: + 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) { +-- +cgit v1.2.2-1-gc45e + |