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

drm/i915/region: support contiguous allocations 



Some kernel internal objects may need to be allocated as a contiguous
block, also thinking ahead the various kernel io_mapping interfaces seem
to expect it, although this is purely a limitation in the kernel
API...so perhaps something to be improved.

Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
Cc: Michael J Ruhl <michael.j.ruhl@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20191008160116.18379-3-matthew.auld@intel.com
parent 232a6eba

drivers/gpu/drm/i915/gem/i915_gem_object.h

+6 −0
Original line number Diff line number Diff line
@@ -139,6 +139,12 @@ i915_gem_object_is_readonly(const struct drm_i915_gem_object *obj) 
	return obj->base.vma_node.readonly;

}



static inline bool

i915_gem_object_is_contiguous(const struct drm_i915_gem_object *obj)

{

	return obj->flags & I915_BO_ALLOC_CONTIGUOUS;

}



static inline bool

i915_gem_object_type_has(const struct drm_i915_gem_object *obj,

			 unsigned long flags)

drivers/gpu/drm/i915/gem/i915_gem_object_types.h

+4 −0
Original line number Diff line number Diff line
@@ -119,6 +119,10 @@ struct drm_i915_gem_object { 


	I915_SELFTEST_DECLARE(struct list_head st_link);



	unsigned long flags;

#define I915_BO_ALLOC_CONTIGUOUS BIT(0)

#define I915_BO_ALLOC_FLAGS (I915_BO_ALLOC_CONTIGUOUS)



	/*

	 * Is the object to be mapped as read-only to the GPU

	 * Only honoured if hardware has relevant pte bit

drivers/gpu/drm/i915/gem/i915_gem_region.c

+12 −3
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ i915_gem_object_get_pages_buddy(struct drm_i915_gem_object *obj) 
{

	struct intel_memory_region *mem = obj->mm.region;

	struct list_head *blocks = &obj->mm.blocks;

	unsigned int flags = I915_ALLOC_MIN_PAGE_SIZE;

	resource_size_t size = obj->base.size;

	resource_size_t prev_end;

	struct i915_buddy_block *block;

	unsigned int flags;

	struct sg_table *st;

	struct scatterlist *sg;

	unsigned int sg_page_sizes;
@@ -41,6 +41,10 @@ i915_gem_object_get_pages_buddy(struct drm_i915_gem_object *obj) 
		return -ENOMEM;

	}



	flags = I915_ALLOC_MIN_PAGE_SIZE;

	if (obj->flags & I915_BO_ALLOC_CONTIGUOUS)

		flags |= I915_ALLOC_CONTIGUOUS;



	ret = __intel_memory_region_get_pages_buddy(mem, size, flags, blocks);

	if (ret)

		goto err_free_sg;
@@ -55,7 +59,8 @@ i915_gem_object_get_pages_buddy(struct drm_i915_gem_object *obj) 
	list_for_each_entry(block, blocks, link) {

		u64 block_size, offset;



		block_size = i915_buddy_block_size(&mem->mm, block);

		block_size = min_t(u64, size,

				   i915_buddy_block_size(&mem->mm, block));

		offset = i915_buddy_block_offset(block);



		GEM_BUG_ON(overflows_type(block_size, sg->length));
@@ -96,10 +101,12 @@ err_free_sg: 
}



void i915_gem_object_init_memory_region(struct drm_i915_gem_object *obj,

					struct intel_memory_region *mem)

					struct intel_memory_region *mem,

					unsigned long flags)

{

	INIT_LIST_HEAD(&obj->mm.blocks);

	obj->mm.region = intel_memory_region_get(mem);

	obj->flags |= flags;

}



void i915_gem_object_release_memory_region(struct drm_i915_gem_object *obj)
@@ -120,6 +127,8 @@ i915_gem_object_create_region(struct intel_memory_region *mem, 
	 * future.

	 */



	GEM_BUG_ON(flags & ~I915_BO_ALLOC_FLAGS);



	if (!mem)

		return ERR_PTR(-ENODEV);

drivers/gpu/drm/i915/gem/i915_gem_region.h

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ void i915_gem_object_put_pages_buddy(struct drm_i915_gem_object *obj, 
				     struct sg_table *pages);



void i915_gem_object_init_memory_region(struct drm_i915_gem_object *obj,

					struct intel_memory_region *mem);

					struct intel_memory_region *mem,

					unsigned long flags);

void i915_gem_object_release_memory_region(struct drm_i915_gem_object *obj);



struct drm_i915_gem_object *

drivers/gpu/drm/i915/gem/selftests/huge_pages.c

+39 −32
Original line number Diff line number Diff line
@@ -456,6 +456,7 @@ out_device: 


static int igt_mock_memory_region_huge_pages(void *arg)

{

	const unsigned int flags[] = { 0, I915_BO_ALLOC_CONTIGUOUS };

	struct i915_ppgtt *ppgtt = arg;

	struct drm_i915_private *i915 = ppgtt->vm.i915;

	unsigned long supported = INTEL_INFO(i915)->page_sizes;
@@ -474,8 +475,11 @@ static int igt_mock_memory_region_huge_pages(void *arg) 
	for_each_set_bit(bit, &supported, ilog2(I915_GTT_MAX_PAGE_SIZE) + 1) {

		unsigned int page_size = BIT(bit);

		resource_size_t phys;

		int i;



		obj = i915_gem_object_create_region(mem, page_size, 0);

		for (i = 0; i < ARRAY_SIZE(flags); ++i) {

			obj = i915_gem_object_create_region(mem, page_size,

							    flags[i]);

			if (IS_ERR(obj)) {

				err = PTR_ERR(obj);

				goto out_region;
@@ -505,7 +509,8 @@ static int igt_mock_memory_region_huge_pages(void *arg) 


			if (vma->page_sizes.gtt != page_size) {

				pr_err("%s page_sizes.gtt=%u, expected=%u\n",

			       __func__, vma->page_sizes.gtt, page_size);

				       __func__, vma->page_sizes.gtt,

				       page_size);

				err = -EINVAL;

				goto out_unpin;

			}
@@ -513,8 +518,10 @@ static int igt_mock_memory_region_huge_pages(void *arg) 
			i915_vma_unpin(vma);

			i915_vma_close(vma);



			__i915_gem_object_put_pages(obj, I915_MM_NORMAL);

			i915_gem_object_put(obj);

		}

	}



	goto out_region;

CRA Git | Maintained and supported by SUSTech CRA and CCSE