提交 5cacaac7 编写于 作者: B Ben Widawsky 提交者: Daniel Vetter

drm/i915: Fix up map and fenceable for VMA

formerly: "drm/i915: Create VMAs (part 3.5) - map and fenceable
tracking"

The map_and_fenceable tracking is per object. GTT mapping, and fences
only apply to global GTT. As such,  object operations which are not
performed on the global GTT should not effect mappable or fenceable
characteristics.

Functionally, this commit could very well be squashed in to a previous
patch which updated object operations to take a VM argument.  This
commit is split out because it's a bit tricky (or at least it was for
me).
Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
[danvet: Drop the bogus hunk in i915_vma_unbind as discussed with
Ben.]
Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
上级 2b4bd0e0
......@@ -2642,7 +2642,8 @@ int i915_vma_unbind(struct i915_vma *vma)
list_del(&obj->mm_list);
/* Avoid an unnecessary call to unbind on rebind. */
obj->map_and_fenceable = true;
if (i915_is_ggtt(vma->vm))
obj->map_and_fenceable = true;
list_del(&vma->vma_link);
drm_mm_remove_node(&vma->node);
......@@ -3203,7 +3204,9 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj,
i915_is_ggtt(vm) &&
vma->node.start + obj->base.size <= dev_priv->gtt.mappable_end;
obj->map_and_fenceable = mappable && fenceable;
/* Map and fenceable only changes if the VM is the global GGTT */
if (i915_is_ggtt(vm))
obj->map_and_fenceable = mappable && fenceable;
trace_i915_vma_bind(vma, map_and_fenceable);
i915_gem_verify_gtt(dev);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册