From: jsg <jsg@openbsd.org>
Date: Mon, 27 Mar 2023 04:25:33 +0000 (+0000)
Subject: drm/i915: Don't use stolen memory for ring buffers with LLC
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=59e8c142d16b1a48d913407d2ed7c1016c9fa474;p=openbsd

drm/i915: Don't use stolen memory for ring buffers with LLC

From John Harrison
d805c28e11fc2a3043bb75aae098e576d746f625 in linux-6.1.y/6.1.16
690e0ec8e63da9a29b39fedc6ed5da09c7c82651 in mainline linux
---

diff --git a/sys/dev/pci/drm/i915/gt/intel_ring.c b/sys/dev/pci/drm/i915/gt/intel_ring.c
index 15ec64d881c..fb1d2595392 100644
--- a/sys/dev/pci/drm/i915/gt/intel_ring.c
+++ b/sys/dev/pci/drm/i915/gt/intel_ring.c
@@ -116,7 +116,7 @@ static struct i915_vma *create_ring_vma(struct i915_ggtt *ggtt, int size)
 
 	obj = i915_gem_object_create_lmem(i915, size, I915_BO_ALLOC_VOLATILE |
 					  I915_BO_ALLOC_PM_VOLATILE);
-	if (IS_ERR(obj) && i915_ggtt_has_aperture(ggtt))
+	if (IS_ERR(obj) && i915_ggtt_has_aperture(ggtt) && !HAS_LLC(i915))
 		obj = i915_gem_object_create_stolen(i915, size);
 	if (IS_ERR(obj))
 		obj = i915_gem_object_create_internal(i915, size);