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>

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 6cb4467005c08d1758ee60de1f1e027f21b8b3d0..fd4872497a722b78d8e4bd673f422637f71910a0 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3205,12 +3205,11 @@ search_free:
        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;
        }