drm/i915: use vma->node directly and rewrap map&fence in bind

Use () to make for neater alignment of the split lines, too. With this
we ditch another jump through the obj_gtt_size/offset indirection
maze.

Cc: Ben Widawsky <benjamin.widawsky@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2013-08-14 10:21:23 +02:00
parent 4bd561b3e8
commit 49987099e2

View file

@ -3205,12 +3205,11 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj,
if (i915_is_ggtt(vm)) {
bool mappable, fenceable;
fenceable =
i915_gem_obj_ggtt_size(obj) == fence_size &&
(i915_gem_obj_ggtt_offset(obj) & (fence_alignment - 1)) == 0;
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;
mappable = (vma->node.start + obj->base.size <=
dev_priv->gtt.mappable_end);
obj->map_and_fenceable = mappable && fenceable;
}