All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] drm/i915/gem: Fix gem_madvise for ttm+shmem objects
@ 2021-11-08 12:36 ` Thomas Hellström
  0 siblings, 0 replies; 9+ messages in thread
From: Thomas Hellström @ 2021-11-08 12:36 UTC (permalink / raw)
  To: intel-gfx, dri-devel; +Cc: Thomas Hellström, matthew.auld

Gem-TTM objects that are backed by shmem might have populated
page-vectors without having the GEM pages set. Those objects
aren't moved to the correct shrinker / purge list by gem_madvise.

For such objects, identified by having the
_SELF_MANAGED_SHRINK_LIST set, make sure they end up on the
correct list.

v2:
- Revert a change that made swapped-out objects inaccessible for
  truncating. (Matthew Auld)

Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_gem.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index d0e642c82064..527228d4da7e 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1005,7 +1005,8 @@ i915_gem_madvise_ioctl(struct drm_device *dev, void *data,
 			obj->ops->adjust_lru(obj);
 	}
 
-	if (i915_gem_object_has_pages(obj)) {
+	if (i915_gem_object_has_pages(obj) ||
+	    i915_gem_object_has_self_managed_shrink_list(obj)) {
 		unsigned long flags;
 
 		spin_lock_irqsave(&i915->mm.obj_lock, flags);
-- 
2.31.1


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2021-11-08 18:19 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-08 12:36 [PATCH v2] drm/i915/gem: Fix gem_madvise for ttm+shmem objects Thomas Hellström
2021-11-08 12:36 ` [Intel-gfx] " Thomas Hellström
2021-11-08 12:39 ` Matthew Auld
2021-11-08 12:39   ` [Intel-gfx] " Matthew Auld
2021-11-08 13:25 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gem: Fix gem_madvise for ttm+shmem objects (rev2) Patchwork
2021-11-08 14:44 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-11-08 14:48   ` Thomas Hellström
2021-11-08 18:19     ` Vudum, Lakshminarayana
2021-11-08 16:36 ` [Intel-gfx] ✓ Fi.CI.IGT: success " Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.