diff mbox series

[4/4] Revert "drm/i915/dpt: Make DPT object unshrinkable"

Message ID 20241127061117.25622-5-ville.syrjala@linux.intel.com (mailing list archive)
State New
Headers show
Series drm/i915/dpt: Try to make DPT shrinkable again | expand

Commit Message

Ville Syrjala Nov. 27, 2024, 6:11 a.m. UTC 
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(-)

Comments

Brian Geffon Nov. 27, 2024, 9 a.m. UTC | #1 
On Wed, Nov 27, 2024 at 3:11 PM Ville Syrjala
<ville.syrjala@linux.intel.com> wrote:
>
> 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>

Acked-by: Brian Geffon <bgeffon@google.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
>
diff mbox series

Patch

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