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

Commit fa3f46af authored by Matthew Auld's avatar Matthew Auld Committed by Chris Wilson
Browse files

drm/i915: introduce vm set_pages/clear_pages 



Move the setting/clearing of the vma->pages to a vm operation. Doing so
neatens things up a little, but more importantly gives us a sane place
to also set/clear the vma->pages_sizes, which we introduce later in
preparation for supporting huge-pages.

v2: remove redundant vma->pages check

v3: GEM_BUG_ON(vma->pages) following i915_vma_remove

Suggested-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171006145041.21673-8-matthew.auld@intel.com


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171006221833.32439-7-chris@chris-wilson.co.uk
parent a5c08166

drivers/gpu/drm/i915/i915_gem_gtt.c

+44 −26
Original line number Diff line number Diff line
@@ -205,8 +205,6 @@ static int ppgtt_bind_vma(struct i915_vma *vma, 
			return ret;

	}



	vma->pages = vma->obj->mm.pages;



	/* Currently applicable only to VLV */

	pte_flags = 0;

	if (vma->obj->gt_ro)
@@ -222,6 +220,26 @@ static void ppgtt_unbind_vma(struct i915_vma *vma) 
	vma->vm->clear_range(vma->vm, vma->node.start, vma->size);

}



static int ppgtt_set_pages(struct i915_vma *vma)

{

	GEM_BUG_ON(vma->pages);



	vma->pages = vma->obj->mm.pages;



	return 0;

}



static void clear_pages(struct i915_vma *vma)

{

	GEM_BUG_ON(!vma->pages);



	if (vma->pages != vma->obj->mm.pages) {

		sg_free_table(vma->pages);

		kfree(vma->pages);

	}

	vma->pages = NULL;

}



static gen8_pte_t gen8_pte_encode(dma_addr_t addr,

				  enum i915_cache_level level)

{
@@ -1452,6 +1470,8 @@ static int gen8_ppgtt_init(struct i915_hw_ppgtt *ppgtt) 
	ppgtt->base.cleanup = gen8_ppgtt_cleanup;

	ppgtt->base.unbind_vma = ppgtt_unbind_vma;

	ppgtt->base.bind_vma = ppgtt_bind_vma;

	ppgtt->base.set_pages = ppgtt_set_pages;

	ppgtt->base.clear_pages = clear_pages;

	ppgtt->debug_dump = gen8_dump_ppgtt;



	return 0;
@@ -1894,6 +1914,8 @@ static int gen6_ppgtt_init(struct i915_hw_ppgtt *ppgtt) 
	ppgtt->base.insert_entries = gen6_ppgtt_insert_entries;

	ppgtt->base.unbind_vma = ppgtt_unbind_vma;

	ppgtt->base.bind_vma = ppgtt_bind_vma;

	ppgtt->base.set_pages = ppgtt_set_pages;

	ppgtt->base.clear_pages = clear_pages;

	ppgtt->base.cleanup = gen6_ppgtt_cleanup;

	ppgtt->debug_dump = gen6_dump_ppgtt;
@@ -2405,12 +2427,6 @@ static int ggtt_bind_vma(struct i915_vma *vma, 
	struct drm_i915_gem_object *obj = vma->obj;

	u32 pte_flags;



	if (unlikely(!vma->pages)) {

		int ret = i915_get_ggtt_vma_pages(vma);

		if (ret)

			return ret;

	}



	/* Currently applicable only to VLV */

	pte_flags = 0;

	if (obj->gt_ro)
@@ -2447,12 +2463,6 @@ static int aliasing_gtt_bind_vma(struct i915_vma *vma, 
	u32 pte_flags;

	int ret;



	if (unlikely(!vma->pages)) {

		ret = i915_get_ggtt_vma_pages(vma);

		if (ret)

			return ret;

	}



	/* Currently applicable only to VLV */

	pte_flags = 0;

	if (vma->obj->gt_ro)
@@ -2467,7 +2477,7 @@ static int aliasing_gtt_bind_vma(struct i915_vma *vma, 
							     vma->node.start,

							     vma->size);

			if (ret)

				goto err_pages;

				return ret;

		}



		appgtt->base.insert_entries(&appgtt->base, vma, cache_level,
@@ -2481,17 +2491,6 @@ static int aliasing_gtt_bind_vma(struct i915_vma *vma, 
	}



	return 0;



err_pages:

	if (!(vma->flags & (I915_VMA_GLOBAL_BIND | I915_VMA_LOCAL_BIND))) {

		if (vma->pages != vma->obj->mm.pages) {

			GEM_BUG_ON(!vma->pages);

			sg_free_table(vma->pages);

			kfree(vma->pages);

		}

		vma->pages = NULL;

	}

	return ret;

}



static void aliasing_gtt_unbind_vma(struct i915_vma *vma)
@@ -2529,6 +2528,19 @@ void i915_gem_gtt_finish_pages(struct drm_i915_gem_object *obj, 
	dma_unmap_sg(kdev, pages->sgl, pages->nents, PCI_DMA_BIDIRECTIONAL);

}



static int ggtt_set_pages(struct i915_vma *vma)

{

	int ret;



	GEM_BUG_ON(vma->pages);



	ret = i915_get_ggtt_vma_pages(vma);

	if (ret)

		return ret;



	return 0;

}



static void i915_gtt_color_adjust(const struct drm_mm_node *node,

				  unsigned long color,

				  u64 *start,
@@ -3151,6 +3163,8 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt) 
	ggtt->base.cleanup = gen6_gmch_remove;

	ggtt->base.bind_vma = ggtt_bind_vma;

	ggtt->base.unbind_vma = ggtt_unbind_vma;

	ggtt->base.set_pages = ggtt_set_pages;

	ggtt->base.clear_pages = clear_pages;

	ggtt->base.insert_page = gen8_ggtt_insert_page;

	ggtt->base.clear_range = nop_clear_range;

	if (!USES_FULL_PPGTT(dev_priv) || intel_scanout_needs_vtd_wa(dev_priv))
@@ -3209,6 +3223,8 @@ static int gen6_gmch_probe(struct i915_ggtt *ggtt) 
	ggtt->base.insert_entries = gen6_ggtt_insert_entries;

	ggtt->base.bind_vma = ggtt_bind_vma;

	ggtt->base.unbind_vma = ggtt_unbind_vma;

	ggtt->base.set_pages = ggtt_set_pages;

	ggtt->base.clear_pages = clear_pages;

	ggtt->base.cleanup = gen6_gmch_remove;



	ggtt->invalidate = gen6_ggtt_invalidate;
@@ -3254,6 +3270,8 @@ static int i915_gmch_probe(struct i915_ggtt *ggtt) 
	ggtt->base.clear_range = i915_ggtt_clear_range;

	ggtt->base.bind_vma = ggtt_bind_vma;

	ggtt->base.unbind_vma = ggtt_unbind_vma;

	ggtt->base.set_pages = ggtt_set_pages;

	ggtt->base.clear_pages = clear_pages;

	ggtt->base.cleanup = i915_gmch_remove;



	ggtt->invalidate = gmch_ggtt_invalidate;

drivers/gpu/drm/i915/i915_gem_gtt.h

+2 −0
Original line number Diff line number Diff line
@@ -335,6 +335,8 @@ struct i915_address_space { 
	int (*bind_vma)(struct i915_vma *vma,

			enum i915_cache_level cache_level,

			u32 flags);

	int (*set_pages)(struct i915_vma *vma);

	void (*clear_pages)(struct i915_vma *vma);



	I915_SELFTEST_DECLARE(struct fault_attr fault_attr);

};

drivers/gpu/drm/i915/i915_vma.c

+16 −11
Original line number Diff line number Diff line
@@ -266,6 +266,8 @@ int i915_vma_bind(struct i915_vma *vma, enum i915_cache_level cache_level, 
	if (bind_flags == 0)

		return 0;



	GEM_BUG_ON(!vma->pages);



	trace_i915_vma_bind(vma, bind_flags);

	ret = vma->vm->bind_vma(vma, cache_level, bind_flags);

	if (ret)
@@ -471,25 +473,31 @@ i915_vma_insert(struct i915_vma *vma, u64 size, u64 alignment, u64 flags) 
	if (ret)

		return ret;



	GEM_BUG_ON(vma->pages);



	ret = vma->vm->set_pages(vma);

	if (ret)

		goto err_unpin;



	if (flags & PIN_OFFSET_FIXED) {

		u64 offset = flags & PIN_OFFSET_MASK;

		if (!IS_ALIGNED(offset, alignment) ||

		    range_overflows(offset, size, end)) {

			ret = -EINVAL;

			goto err_unpin;

			goto err_clear;

		}



		ret = i915_gem_gtt_reserve(vma->vm, &vma->node,

					   size, offset, obj->cache_level,

					   flags);

		if (ret)

			goto err_unpin;

			goto err_clear;

	} else {

		ret = i915_gem_gtt_insert(vma->vm, &vma->node,

					  size, alignment, obj->cache_level,

					  start, end, flags);

		if (ret)

			goto err_unpin;

			goto err_clear;



		GEM_BUG_ON(vma->node.start < start);

		GEM_BUG_ON(vma->node.start + vma->node.size > end);
@@ -504,6 +512,8 @@ i915_vma_insert(struct i915_vma *vma, u64 size, u64 alignment, u64 flags) 


	return 0;



err_clear:

	vma->vm->clear_pages(vma);

err_unpin:

	i915_gem_object_unpin_pages(obj);

	return ret;
@@ -517,6 +527,8 @@ i915_vma_remove(struct i915_vma *vma) 
	GEM_BUG_ON(!drm_mm_node_allocated(&vma->node));

	GEM_BUG_ON(vma->flags & (I915_VMA_GLOBAL_BIND | I915_VMA_LOCAL_BIND));



	vma->vm->clear_pages(vma);



	drm_mm_remove_node(&vma->node);

	list_move_tail(&vma->vm_link, &vma->vm->unbound_list);
@@ -569,8 +581,8 @@ int __i915_vma_do_pin(struct i915_vma *vma, 


err_remove:

	if ((bound & I915_VMA_BIND_MASK) == 0) {

		GEM_BUG_ON(vma->pages);

		i915_vma_remove(vma);

		GEM_BUG_ON(vma->pages);

	}

err_unpin:

	__i915_vma_unpin(vma);
@@ -695,13 +707,6 @@ int i915_vma_unbind(struct i915_vma *vma) 
	}

	vma->flags &= ~(I915_VMA_GLOBAL_BIND | I915_VMA_LOCAL_BIND);



	if (vma->pages != obj->mm.pages) {

		GEM_BUG_ON(!vma->pages);

		sg_free_table(vma->pages);

		kfree(vma->pages);

	}

	vma->pages = NULL;



	i915_vma_remove(vma);



destroy:

drivers/gpu/drm/i915/selftests/mock_gtt.c

+4 −7
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ static int mock_bind_ppgtt(struct i915_vma *vma, 
			   u32 flags)

{

	GEM_BUG_ON(flags & I915_VMA_GLOBAL_BIND);

	vma->pages = vma->obj->mm.pages;

	vma->flags |= I915_VMA_LOCAL_BIND;

	return 0;

}
@@ -84,6 +83,8 @@ mock_ppgtt(struct drm_i915_private *i915, 
	ppgtt->base.insert_entries = mock_insert_entries;

	ppgtt->base.bind_vma = mock_bind_ppgtt;

	ppgtt->base.unbind_vma = mock_unbind_ppgtt;

	ppgtt->base.set_pages = ppgtt_set_pages;

	ppgtt->base.clear_pages = clear_pages;

	ppgtt->base.cleanup = mock_cleanup;



	return ppgtt;
@@ -93,12 +94,6 @@ static int mock_bind_ggtt(struct i915_vma *vma, 
			  enum i915_cache_level cache_level,

			  u32 flags)

{

	int err;



	err = i915_get_ggtt_vma_pages(vma);

	if (err)

		return err;



	vma->flags |= I915_VMA_GLOBAL_BIND | I915_VMA_LOCAL_BIND;

	return 0;

}
@@ -124,6 +119,8 @@ void mock_init_ggtt(struct drm_i915_private *i915) 
	ggtt->base.insert_entries = mock_insert_entries;

	ggtt->base.bind_vma = mock_bind_ggtt;

	ggtt->base.unbind_vma = mock_unbind_ggtt;

	ggtt->base.set_pages = ggtt_set_pages;

	ggtt->base.clear_pages = clear_pages;

	ggtt->base.cleanup = mock_cleanup;



	i915_address_space_init(&ggtt->base, i915, "global");