Attachment 109756 Details for Bug 86425 – patch rebased onto -fixes

[patch] patch rebased onto -fixes

0001-drm-i915-Only-mark-as-map-and-fenceable-when-bound-i.patch (text/plain), 3.19 KB, created by Daniel Vetter on 2014-11-20 14:53:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2014-11-20 14:53:55 UTC

Size: 3.19 KB

patch

obsolete

>From e217e08cfec7ccbab855a92627d7590dbdd246bf Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Fri, 31 Oct 2014 13:53:52 +0000
>Subject: [PATCH] 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: Chris Wilson <chris@chris-wilson.co.uk>
>[danvet: Rebase onto -fixes.]
>Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>---
> drivers/gpu/drm/i915/i915_gem.c | 39 +++++++++++++++++++++++++--------------
> 1 file changed, 25 insertions(+), 14 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index 28f91df2604d..1e191fcac6d9 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -3514,20 +3514,6 @@ search_free:
> 	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);
>@@ -4101,6 +4087,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;
>+	bool bound;
> 	int ret;
> 
> 	if (WARN_ON(vm == &dev_priv->mm.aliasing_ppgtt->base))
>@@ -4130,6 +4117,7 @@ i915_gem_object_pin(struct drm_i915_gem_object *obj,
> 		}
> 	}
> 
>+	bound = obj->has_global_gtt_mapping;
> 	if (vma == NULL || !drm_mm_node_allocated(&vma->node)) {
> 		vma = i915_gem_object_bind_to_vm(obj, vm, alignment, flags);
> 		if (IS_ERR(vma))
>@@ -4139,6 +4127,29 @@ i915_gem_object_pin(struct drm_i915_gem_object *obj,
> 	if (flags & PIN_GLOBAL && !obj->has_global_gtt_mapping)
> 		vma->bind_vma(vma, obj->cache_level, GLOBAL_BIND);
> 
>+	if (bound != obj->has_global_gtt_mapping) {
>+		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;
>-- 
>2.1.1
>

Actions: View | Splinter Review

Attachments on bug 86425: 109658 | 109748 | 109756 | 114843

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.