From: jsg <jsg@openbsd.org>
Date: Mon, 24 Jun 2024 03:52:26 +0000 (+0000)
Subject: drm/i915/dpt: Make DPT object unshrinkable
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=15176fd8050f89683267a69e678dba72fe9e27fe;p=openbsd

drm/i915/dpt: Make DPT object unshrinkable

From Vidya Srinivas
7a9883be3b98673333eec65c4a21cc18e60292eb in linux-6.6.y/6.6.35
43e2b37e2ab660c3565d4cff27922bc70e79c3f1 in mainline linux
---

diff --git a/sys/dev/pci/drm/i915/gem/i915_gem_object.h b/sys/dev/pci/drm/i915/gem/i915_gem_object.h
index e5e9ea2f635..a4e14fa3af4 100644
--- a/sys/dev/pci/drm/i915/gem/i915_gem_object.h
+++ b/sys/dev/pci/drm/i915/gem/i915_gem_object.h
@@ -285,7 +285,9 @@ bool i915_gem_object_has_iomem(const struct drm_i915_gem_object *obj);
 static inline bool
 i915_gem_object_is_shrinkable(const struct drm_i915_gem_object *obj)
 {
-	return i915_gem_object_type_has(obj, I915_GEM_OBJECT_IS_SHRINKABLE);
+	/* TODO: make DPT shrinkable when it has no bound vmas */
+	return i915_gem_object_type_has(obj, I915_GEM_OBJECT_IS_SHRINKABLE) &&
+		!obj->is_dpt;
 }
 
 static inline bool