From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 12 Mar 2023 11:30:19 +0000 (+0100)
Subject: 5.15-stable patches
X-Git-Tag: v5.15.101~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08c8241d9cd051d837a39923e5c6d63267e3271a;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	revert-drm-i915-don-t-use-bar-mappings-for-ring-buffers-with-llc.patch
---

diff --git a/queue-5.15/revert-drm-i915-don-t-use-bar-mappings-for-ring-buffers-with-llc.patch b/queue-5.15/revert-drm-i915-don-t-use-bar-mappings-for-ring-buffers-with-llc.patch
new file mode 100644
index 00000000000..95afd21eef2
--- /dev/null
+++ b/queue-5.15/revert-drm-i915-don-t-use-bar-mappings-for-ring-buffers-with-llc.patch
@@ -0,0 +1,55 @@
+From b83855e90c4411bd06b4c201ea91ecec22f887ca Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Sun, 12 Mar 2023 12:26:56 +0100
+Subject: Revert "drm/i915: Don't use BAR mappings for ring buffers with LLC"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 4eb6789f9177a5fdb90e1b7cdd4b069d1fb9ce45 which is
+commit 85636167e3206c3fbd52254fc432991cc4e90194 upstream.
+
+It has been reported to cause problems on Alpine Linux and Manjaro Linux
+5.15-based releases, so revert it for now until it can be sorted out.
+
+Reported-by: "A.P. Jo." <apjo@tuta.io>
+Link: https://lore.kernel.org/r/NQJqG8n--3-9@tuta.io
+Link: https://gitlab.alpinelinux.org/alpine/aports/-/issues/14704
+Reported-by: Philip Müller <philm@manjaro.org>
+Link: https://lore.kernel.org/r/d955327b-cb1c-4646-76b9-b0499c0c64c6@manjaro.org
+Link: https://gitlab.freedesktop.org/drm/intel/-/issues/8284
+Cc: John Harrison <John.C.Harrison@Intel.com>
+Cc: Chris Wilson <chris@chris-wilson.co.uk>
+Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
+Cc: Jani Nikula <jani.nikula@linux.intel.com>
+Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
+Cc: intel-gfx@lists.freedesktop.org
+Cc: <stable@vger.kernel.org> # v4.9+
+Cc: Jouni Högander <jouni.hogander@intel.com>
+Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
+Cc: Jani Nikula <jani.nikula@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/i915/gt/intel_ring.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/i915/gt/intel_ring.c
++++ b/drivers/gpu/drm/i915/gt/intel_ring.c
+@@ -51,7 +51,7 @@ int intel_ring_pin(struct intel_ring *ri
+ 	if (unlikely(ret))
+ 		goto err_unpin;
+ 
+-	if (i915_vma_is_map_and_fenceable(vma) && !HAS_LLC(vma->vm->i915)) {
++	if (i915_vma_is_map_and_fenceable(vma)) {
+ 		addr = (void __force *)i915_vma_pin_iomap(vma);
+ 	} else {
+ 		int type = i915_coherent_map_type(vma->vm->i915, vma->obj, false);
+@@ -96,7 +96,7 @@ void intel_ring_unpin(struct intel_ring
+ 		return;
+ 
+ 	i915_vma_unset_ggtt_write(vma);
+-	if (i915_vma_is_map_and_fenceable(vma) && !HAS_LLC(vma->vm->i915))
++	if (i915_vma_is_map_and_fenceable(vma))
+ 		i915_vma_unpin_iomap(vma);
+ 	else
+ 		i915_gem_object_unpin_map(vma->obj);
diff --git a/queue-5.15/series b/queue-5.15/series
new file mode 100644
index 00000000000..66d7d2769ce
--- /dev/null
+++ b/queue-5.15/series
@@ -0,0 +1 @@
+revert-drm-i915-don-t-use-bar-mappings-for-ring-buffers-with-llc.patch