Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06615ee5 authored by Joonas Lahtinen's avatar Joonas Lahtinen Committed by Daniel Vetter
Browse files

drm/i915: Do not clear mappings beyond VMA size 



Do not to clear mappings outside the allocated VMA under any
circumstances. Only clear the smaller of VMA or object page count.

This is required to allow creating partial object VMAs which in
turn are needed for partial GGTT views.

Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 09b1eb13

drivers/gpu/drm/i915/i915_gem_gtt.c

+6 −2
Original line number Diff line number Diff line
@@ -1945,19 +1945,23 @@ static void ggtt_unbind_vma(struct i915_vma *vma) 
	struct drm_device *dev = vma->vm->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_gem_object *obj = vma->obj;

	const uint64_t size = min_t(uint64_t,

				    obj->base.size,

				    vma->node.size);



	if (vma->bound & GLOBAL_BIND) {

		vma->vm->clear_range(vma->vm,

				     vma->node.start,

				     obj->base.size,

				     size,

				     true);

	}



	if (dev_priv->mm.aliasing_ppgtt && vma->bound & LOCAL_BIND) {

		struct i915_hw_ppgtt *appgtt = dev_priv->mm.aliasing_ppgtt;



		appgtt->base.clear_range(&appgtt->base,

					 vma->node.start,

					 obj->base.size,

					 size,

					 true);

	}

}