Update to 5.6.7-1

1 files changed, 0 insertions, 64 deletions

diff --git a/0007-drm-i915-gem-Try-to-flush-pending-unbind-events.patch b/0007-drm-i915-gem-Try-to-flush-pending-unbind-events.patch
deleted file mode 100644
index bbd38fa0930e..000000000000
--- a/0007-drm-i915-gem-Try-to-flush-pending-unbind-events.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 589899b9b2b46961ccb096262b8e85b1656a4d15 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Wed, 4 Dec 2019 12:35:56 +0000
-Subject: [PATCH 07/13] drm/i915/gem: Try to flush pending unbind events
-
-If we cannot handle a vma within the unbind loop, try to flush the
-pending events (i915_vma_parked, i915_vm_release) and try again. This
-avoids a round trip to userspace that is not guaranteed to make forward
-progress, as the events we wait upon require being idle.
-
-References: cb6c3d45f948 ("drm/i915/gem: Avoid parking the vma as we unbind")
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-Cc: Matthew Auld <matthew.auld@intel.com>
-Reviewed-by: Matthew Auld <matthew.auld@intel.com>
-Link: https://patchwork.freedesktop.org/patch/msgid/20191204123556.3740002-1-chris@chris-wilson.co.uk
----
- drivers/gpu/drm/i915/i915_gem.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
-index 739543812422..85b12228c2cf 100644
---- a/drivers/gpu/drm/i915/i915_gem.c
-+++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -123,7 +123,7 @@ int i915_gem_object_unbind(struct drm_i915_gem_object *obj,
- 	LIST_HEAD(still_in_list);
- 	intel_wakeref_t wakeref;
- 	struct i915_vma *vma;
--	int ret = 0;
-+	int ret;
- 
- 	if (!atomic_read(&obj->bind_count))
- 		return 0;
-@@ -136,6 +136,8 @@ int i915_gem_object_unbind(struct drm_i915_gem_object *obj,
- 	 */
- 	wakeref = intel_runtime_pm_get(rpm);
- 
-+try_again:
-+	ret = 0;
- 	spin_lock(&obj->vma.lock);
- 	while (!ret && (vma = list_first_entry_or_null(&obj->vma.list,
- 						       struct i915_vma,
-@@ -153,6 +155,7 @@ int i915_gem_object_unbind(struct drm_i915_gem_object *obj,
- 		} else {
- 			if (i915_vma_is_closed(vma)) {
- 				spin_unlock(&obj->vma.lock);
-+				i915_vma_parked(vm->gt);
- 				goto err_vm;
- 			}
- 		}
-@@ -174,6 +177,11 @@ int i915_gem_object_unbind(struct drm_i915_gem_object *obj,
- 	list_splice(&still_in_list, &obj->vma.list);
- 	spin_unlock(&obj->vma.lock);
- 
-+	if (ret == -EAGAIN && flags & I915_GEM_OBJECT_UNBIND_ACTIVE) {
-+		rcu_barrier(); /* flush the i915_vm_release() */
-+		goto try_again;
-+	}
-+
- 	intel_runtime_pm_put(rpm, wakeref);
- 
- 	return ret;
--- 
-2.26.0
-