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

Commit 49987099 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4bd561b3

drivers/gpu/drm/i915/i915_gem.c

+4 −5
Original line number Diff line number Diff line
@@ -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;

	}