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

Commit 62d622c1 authored by Chris Wilson's avatar Chris Wilson Committed by Jani Nikula
Browse files

drm/i915: Set the map-and-fenceable flag for preallocated objects 



As we mark the preallocated objects as bound, we should also flag them
correctly as being map-and-fenceable (if appropriate!) so that later
users do not get confused and try and rebind the pinned vma in order to
get a map-and-fenceable binding.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: "Goel, Akash" <akash.goel@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: drm-intel-fixes@lists.freedesktop.org
Link: http://patchwork.freedesktop.org/patch/msgid/1448029000-10616-1-git-send-email-chris@chris-wilson.co.uk


Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
(cherry picked from commit d0710abb)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 615cb243

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -2839,6 +2839,7 @@ i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj, 




int i915_vma_bind(struct i915_vma *vma, enum i915_cache_level cache_level,

int i915_vma_bind(struct i915_vma *vma, enum i915_cache_level cache_level,

		  u32 flags);

		  u32 flags);

void __i915_vma_set_map_and_fenceable(struct i915_vma *vma);

int __must_check i915_vma_unbind(struct i915_vma *vma);

int __must_check i915_vma_unbind(struct i915_vma *vma);

/*

/*

 * BEWARE: Do not use the function below unless you can _absolutely_

 * BEWARE: Do not use the function below unless you can _absolutely_

drivers/gpu/drm/i915/i915_gem.c

+24 −19
Original line number Original line Diff line number Diff line
@@ -4080,6 +4080,29 @@ i915_vma_misplaced(struct i915_vma *vma, uint32_t alignment, uint64_t flags) 
	return false;

	return false;

}

}





void __i915_vma_set_map_and_fenceable(struct i915_vma *vma)

{

	struct drm_i915_gem_object *obj = vma->obj;

	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 + fence_size <=

		    to_i915(obj->base.dev)->gtt.mappable_end);



	obj->map_and_fenceable = mappable && fenceable;

}



static int

static int

i915_gem_object_do_pin(struct drm_i915_gem_object *obj,

i915_gem_object_do_pin(struct drm_i915_gem_object *obj,

		       struct i915_address_space *vm,

		       struct i915_address_space *vm,
@@ -4147,25 +4170,7 @@ i915_gem_object_do_pin(struct drm_i915_gem_object *obj, 




	if (ggtt_view && ggtt_view->type == I915_GGTT_VIEW_NORMAL &&

	if (ggtt_view && ggtt_view->type == I915_GGTT_VIEW_NORMAL &&

	    (bound ^ vma->bound) & GLOBAL_BIND) {

	    (bound ^ vma->bound) & GLOBAL_BIND) {

		bool mappable, fenceable;

		__i915_vma_set_map_and_fenceable(vma);

		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 + fence_size <=

			    dev_priv->gtt.mappable_end);



		obj->map_and_fenceable = mappable && fenceable;



		WARN_ON(flags & PIN_MAPPABLE && !obj->map_and_fenceable);

		WARN_ON(flags & PIN_MAPPABLE && !obj->map_and_fenceable);

	}

	}

drivers/gpu/drm/i915/i915_gem_gtt.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -2676,6 +2676,7 @@ static int i915_gem_setup_global_gtt(struct drm_device *dev, 
			return ret;

			return ret;

		}

		}

		vma->bound |= GLOBAL_BIND;

		vma->bound |= GLOBAL_BIND;

		__i915_vma_set_map_and_fenceable(vma);

		list_add_tail(&vma->mm_list, &ggtt_vm->inactive_list);

		list_add_tail(&vma->mm_list, &ggtt_vm->inactive_list);

	}

	}

drivers/gpu/drm/i915/i915_gem_stolen.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -687,6 +687,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev, 
		}

		}





		vma->bound |= GLOBAL_BIND;

		vma->bound |= GLOBAL_BIND;

		__i915_vma_set_map_and_fenceable(vma);

		list_add_tail(&vma->mm_list, &ggtt->inactive_list);

		list_add_tail(&vma->mm_list, &ggtt->inactive_list);

	}

	}