diff options
author | graysky | 2020-02-15 07:01:33 -0500 |
---|---|---|
committer | graysky | 2020-02-15 07:01:33 -0500 |
commit | 342f3ba47321d6a5725ea08d62688ae97293737c (patch) | |
tree | 1e2c5b0fafef695ef442c1b38674d897130f1040 /0012-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch | |
parent | e5933947645595091f113caf556734083c8a1288 (diff) | |
download | aur-342f3ba47321d6a5725ea08d62688ae97293737c.tar.gz |
Update to 5.5.4-1
Diffstat (limited to '0012-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch')
-rw-r--r-- | 0012-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/0012-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch b/0012-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch new file mode 100644 index 000000000000..1de38745dc39 --- /dev/null +++ b/0012-drm-i915-Add-a-simple-is-bound-check-before-unbindin.patch @@ -0,0 +1,41 @@ +From 513cbef093293a7f0e331eb4fee8e6a1bb9bf5a2 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 12/14] 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.0 + |