From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Brian Geffon <bgeffon@google.com>,
Vidya Srinivas <vidya.srinivas@intel.com>
Subject: [PATCH 4/4] Revert "drm/i915/dpt: Make DPT object unshrinkable"
Date: Wed, 27 Nov 2024 08:11:17 +0200 [thread overview]
Message-ID: <20241127061117.25622-5-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20241127061117.25622-1-ville.syrjala@linux.intel.com>
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
This reverts commit 51064d471c53dcc8eddd2333c3f1c1d9131ba36c.
Now that we forcefully evict all DPT VMAs during suspend
there should be no problem allowing the shrinker to eat
the DPT objects.
Cc: Brian Geffon <bgeffon@google.com>
Cc: Vidya Srinivas <vidya.srinivas@intel.com>
Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12965
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h
index 3dc61cbd2e11..bb713e096db2 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h
@@ -283,9 +283,7 @@ 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)
{
- /* 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;
+ return i915_gem_object_type_has(obj, I915_GEM_OBJECT_IS_SHRINKABLE);
}
static inline bool
--
2.45.2
next prev parent reply other threads:[~2024-11-27 6:11 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-27 6:11 [PATCH 0/4] drm/i915/dpt: Try to make DPT shrinkable again Ville Syrjala
2024-11-27 6:11 ` [PATCH 1/4] drm/i915: Don't reuse commit_work for the cleanup Ville Syrjala
2024-11-28 7:43 ` Srinivas, Vidya
2024-11-27 6:11 ` [PATCH 2/4] drm/i915: Intruduce display.wq.cleanup Ville Syrjala
2024-11-28 7:43 ` Srinivas, Vidya
2024-11-27 6:11 ` [PATCH 3/4] drm/i915/dpt: Evict all DPT VMAs on suspend Ville Syrjala
2024-11-27 8:32 ` Srinivas, Vidya
2024-11-28 7:44 ` Srinivas, Vidya
2024-12-02 15:40 ` Brian Geffon
2024-12-03 8:20 ` Ville Syrjälä
2024-12-03 8:25 ` Ville Syrjälä
2024-12-03 15:13 ` Brian Geffon
2024-11-27 6:11 ` Ville Syrjala [this message]
2024-11-27 9:00 ` [PATCH 4/4] Revert "drm/i915/dpt: Make DPT object unshrinkable" Brian Geffon
2024-11-28 7:44 ` Srinivas, Vidya
2024-11-27 6:38 ` ✗ Fi.CI.SPARSE: warning for drm/i915/dpt: Try to make DPT shrinkable again Patchwork
2024-11-27 6:55 ` ✓ i915.CI.BAT: success " Patchwork
2024-11-27 8:26 ` ✗ i915.CI.Full: failure " Patchwork
2024-11-27 8:54 ` [PATCH 0/4] " Srinivas, Vidya
2024-11-28 15:40 ` Ville Syrjälä
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241127061117.25622-5-ville.syrjala@linux.intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=bgeffon@google.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=vidya.srinivas@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox