summarylogtreecommitdiffstats
path: root/0009-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch
diff options
context:
space:
mode:
authorgraysky2020-03-19 14:22:11 -0400
committergraysky2020-03-19 14:22:11 -0400
commit15b889bcdede5c6eacc7bb43ede7f51126a89860 (patch)
tree0c319b894bfda9e2e5865d15adb26f40558283bd /0009-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch
parenteb5fcc82dc6da5c1a63a325a11e2ade0750fb054 (diff)
downloadaur-15b889bcdede5c6eacc7bb43ede7f51126a89860.tar.gz
Update to 5.5.11rc1-1
Diffstat (limited to '0009-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch')
-rw-r--r--0009-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/0009-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch b/0009-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch
new file mode 100644
index 00000000000..2520782598c
--- /dev/null
+++ b/0009-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch
@@ -0,0 +1,41 @@
+From ae537a08bb3931e6087e95ecb59043bb13ce76bb Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun, 22 Dec 2019 21:02:54 +0000
+Subject: [PATCH 09/11] drm/i915: Add a simple is-bound check before unbinding
+
+Only acquire the various atomic references required to unbind the vma if
+we do need to unbind the vma.
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+Acked-by: Imre Deak <imre.deak@intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20191222210256.2066451-1-chris@chris-wilson.co.uk
+---
+ drivers/gpu/drm/i915/i915_gem.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
+index c2c025c4f4ad..83eed642cbcd 100644
+--- a/drivers/gpu/drm/i915/i915_gem.c
++++ b/drivers/gpu/drm/i915/i915_gem.c
+@@ -145,6 +145,10 @@ int i915_gem_object_unbind(struct drm_i915_gem_object *obj,
+ struct i915_address_space *vm = vma->vm;
+ bool awake = false;
+
++ list_move_tail(&vma->obj_link, &still_in_list);
++ if (!i915_vma_is_bound(vma, I915_VMA_BIND_MASK))
++ continue;
++
+ ret = -EAGAIN;
+ if (!i915_vm_tryopen(vm))
+ break;
+@@ -160,7 +164,6 @@ int i915_gem_object_unbind(struct drm_i915_gem_object *obj,
+ }
+ }
+
+- list_move_tail(&vma->obj_link, &still_in_list);
+ spin_unlock(&obj->vma.lock);
+
+ ret = -EBUSY;
+--
+2.25.2
+