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

Commit ef79e17c authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Only mark as map-and-fenceable when bound into the GGTT 

We use the obj->map_and_fenceable hint for when we already have a
valid mapping of this object in the aperture. This hint can only apply
to the GGTT and not to the aliasing-ppGTT. One user of the hint is
execbuffer relocation, which began to fail when it tried to follow the
hint and perform the relocate through the non-existent GGTT mapping.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85671


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 9362c7c5

drivers/gpu/drm/i915/i915_gem.c

+25 −14
Original line number Diff line number Diff line
@@ -3476,20 +3476,6 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj, 
	list_move_tail(&obj->global_list, &dev_priv->mm.bound_list);

	list_add_tail(&vma->mm_list, &vm->inactive_list);



	if (i915_is_ggtt(vm)) {

		bool mappable, fenceable;



		fenceable = (vma->node.size == fence_size &&

			     (vma->node.start & (fence_alignment - 1)) == 0);



		mappable = (vma->node.start + obj->base.size <=

			    dev_priv->gtt.mappable_end);



		obj->map_and_fenceable = mappable && fenceable;

	}



	WARN_ON(flags & PIN_MAPPABLE && !obj->map_and_fenceable);



	trace_i915_vma_bind(vma, flags);

	vma->bind_vma(vma, obj->cache_level,

		      flags & (PIN_MAPPABLE | PIN_GLOBAL) ? GLOBAL_BIND : 0);
@@ -4061,6 +4047,7 @@ i915_gem_object_pin(struct drm_i915_gem_object *obj, 
{

	struct drm_i915_private *dev_priv = obj->base.dev->dev_private;

	struct i915_vma *vma;

	unsigned bound;

	int ret;



	if (WARN_ON(vm == &dev_priv->mm.aliasing_ppgtt->base))
@@ -4090,6 +4077,7 @@ i915_gem_object_pin(struct drm_i915_gem_object *obj, 
		}

	}



	bound = vma ? vma->bound : 0;

	if (vma == NULL || !drm_mm_node_allocated(&vma->node)) {

		vma = i915_gem_object_bind_to_vm(obj, vm, alignment, flags);

		if (IS_ERR(vma))
@@ -4099,6 +4087,29 @@ i915_gem_object_pin(struct drm_i915_gem_object *obj, 
	if (flags & PIN_GLOBAL && !(vma->bound & GLOBAL_BIND))

		vma->bind_vma(vma, obj->cache_level, GLOBAL_BIND);



	if ((bound ^ vma->bound) & GLOBAL_BIND) {

		bool mappable, fenceable;

		u32 fence_size, fence_alignment;



		fence_size = i915_gem_get_gtt_size(obj->base.dev,

						   obj->base.size,

						   obj->tiling_mode);

		fence_alignment = i915_gem_get_gtt_alignment(obj->base.dev,

							     obj->base.size,

							     obj->tiling_mode,

							     true);



		fenceable = (vma->node.size == fence_size &&

			     (vma->node.start & (fence_alignment - 1)) == 0);



		mappable = (vma->node.start + obj->base.size <=

			    dev_priv->gtt.mappable_end);



		obj->map_and_fenceable = mappable && fenceable;

	}



	WARN_ON(flags & PIN_MAPPABLE && !obj->map_and_fenceable);



	vma->pin_count++;

	if (flags & PIN_MAPPABLE)

		obj->pin_mappable |= true;