Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 43e2b37

Browse files
vsrini4jnikula
authored andcommitted
drm/i915/dpt: Make DPT object unshrinkable
In some scenarios, the DPT object gets shrunk but the actual framebuffer did not and thus its still there on the DPT's vm->bound_list. Then it tries to rewrite the PTEs via a stale CPU mapping. This causes panic. Cc: stable@vger.kernel.org Reported-by: Shawn Lee <shawn.c.lee@intel.com> Fixes: 0dc987b ("drm/i915/display: Add smem fallback allocation for dpt") Signed-off-by: Vidya Srinivas <vidya.srinivas@intel.com> [vsyrjala: Add TODO comment] Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240520165634.1162470-1-vidya.srinivas@intel.com (cherry picked from commit 51064d4) Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1 parent ee01b6a commit 43e2b37

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/gpu/drm/i915/gem/i915_gem_object.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,9 @@ bool i915_gem_object_has_iomem(const struct drm_i915_gem_object *obj);
284284
static inline bool
285285
i915_gem_object_is_shrinkable(const struct drm_i915_gem_object *obj)
286286
{
287-
return i915_gem_object_type_has(obj, I915_GEM_OBJECT_IS_SHRINKABLE);
287+
/* TODO: make DPT shrinkable when it has no bound vmas */
288+
return i915_gem_object_type_has(obj, I915_GEM_OBJECT_IS_SHRINKABLE) &&
289+
!obj->is_dpt;
288290
}
289291

290292
static inline bool

0 commit comments

Comments
 (0)