Commit 2ffffd0f authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Fix up vma alignment to be u64 



This is not the full fix, as we are required to percolate the u64 nature
down through the drm_mm stack, but this is required now to prevent
explosions due to mismatch between execbuf (eb_vma_misplaced) and vma
binding (i915_vma_misplaced) - and reduces the risk of spurious changes
as we adjust the vma interface in the next patches.

v2: long long casts not required for u64 printk (%llx)

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470324762-2545-6-git-send-email-chris@chris-wilson.co.uk
parent e655bc35

drivers/gpu/drm/i915/i915_drv.h

+6 −8
Original line number Diff line number Diff line
@@ -3032,13 +3032,13 @@ void i915_gem_free_object(struct drm_gem_object *obj); 
int __must_check

i915_gem_object_pin(struct drm_i915_gem_object *obj,

		    struct i915_address_space *vm,

		    uint32_t alignment,

		    uint64_t flags);

		    u64 alignment,

		    u64 flags);

int __must_check

i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj,

			 const struct i915_ggtt_view *view,

			 uint32_t alignment,

			 uint64_t flags);

			 u64 alignment,

			 u64 flags);



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

		  u32 flags);
@@ -3398,11 +3398,9 @@ int i915_gem_context_reset_stats_ioctl(struct drm_device *dev, void *data, 


/* i915_gem_evict.c */

int __must_check i915_gem_evict_something(struct i915_address_space *vm,

					  int min_size,

					  unsigned alignment,

					  u64 min_size, u64 alignment,

					  unsigned cache_level,

					  unsigned long start,

					  unsigned long end,

					  u64 start, u64 end,

					  unsigned flags);

int __must_check i915_gem_evict_for_vma(struct i915_vma *target);

int i915_gem_evict_vm(struct i915_address_space *vm, bool do_idle);

drivers/gpu/drm/i915/i915_gem.c

+11 −11
Original line number Diff line number Diff line
@@ -2963,8 +2963,8 @@ static struct i915_vma * 
i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj,

			   struct i915_address_space *vm,

			   const struct i915_ggtt_view *ggtt_view,

			   unsigned alignment,

			   uint64_t flags)

			   u64 alignment,

			   u64 flags)

{

	struct drm_device *dev = obj->base.dev;

	struct drm_i915_private *dev_priv = to_i915(dev);
@@ -3023,7 +3023,7 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj, 
		alignment = flags & PIN_MAPPABLE ? fence_alignment :

						unfenced_alignment;

	if (flags & PIN_MAPPABLE && alignment & (fence_alignment - 1)) {

		DRM_DEBUG("Invalid object (view type=%u) alignment requested %u\n",

		DRM_DEBUG("Invalid object (view type=%u) alignment requested %llx\n",

			  ggtt_view ? ggtt_view->type : 0,

			  alignment);

		return ERR_PTR(-EINVAL);
@@ -3678,7 +3678,7 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file) 
}



static bool

i915_vma_misplaced(struct i915_vma *vma, uint32_t alignment, uint64_t flags)

i915_vma_misplaced(struct i915_vma *vma, u64 alignment, u64 flags)

{

	struct drm_i915_gem_object *obj = vma->obj;
@@ -3727,8 +3727,8 @@ static int 
i915_gem_object_do_pin(struct drm_i915_gem_object *obj,

		       struct i915_address_space *vm,

		       const struct i915_ggtt_view *ggtt_view,

		       uint32_t alignment,

		       uint64_t flags)

		       u64 alignment,

		       u64 flags)

{

	struct drm_i915_private *dev_priv = to_i915(obj->base.dev);

	struct i915_vma *vma;
@@ -3757,7 +3757,7 @@ i915_gem_object_do_pin(struct drm_i915_gem_object *obj, 
		if (i915_vma_misplaced(vma, alignment, flags)) {

			WARN(vma->pin_count,

			     "bo is already pinned in %s with incorrect alignment:"

			     " offset=%08x %08x, req.alignment=%x, req.map_and_fenceable=%d,"

			     " offset=%08x %08x, req.alignment=%llx, req.map_and_fenceable=%d,"

			     " obj->map_and_fenceable=%d\n",

			     ggtt_view ? "ggtt" : "ppgtt",

			     upper_32_bits(vma->node.start),
@@ -3798,8 +3798,8 @@ i915_gem_object_do_pin(struct drm_i915_gem_object *obj, 
int

i915_gem_object_pin(struct drm_i915_gem_object *obj,

		    struct i915_address_space *vm,

		    uint32_t alignment,

		    uint64_t flags)

		    u64 alignment,

		    u64 flags)

{

	return i915_gem_object_do_pin(obj, vm,

				      i915_is_ggtt(vm) ? &i915_ggtt_view_normal : NULL,
@@ -3809,8 +3809,8 @@ i915_gem_object_pin(struct drm_i915_gem_object *obj, 
int

i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj,

			 const struct i915_ggtt_view *view,

			 uint32_t alignment,

			 uint64_t flags)

			 u64 alignment,

			 u64 flags)

{

	struct drm_device *dev = obj->base.dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

drivers/gpu/drm/i915/i915_gem_evict.c

+3 −2
Original line number Diff line number Diff line
@@ -84,8 +84,9 @@ mark_free(struct i915_vma *vma, struct list_head *unwind) 
 */

int

i915_gem_evict_something(struct i915_address_space *vm,

			 int min_size, unsigned alignment, unsigned cache_level,

			 unsigned long start, unsigned long end,

			 u64 min_size, u64 alignment,

			 unsigned cache_level,

			 u64 start, u64 end,

			 unsigned flags)

{

	struct drm_i915_private *dev_priv = to_i915(vm->dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE