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

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

drm/i915: introduce page_size members 



In preparation for supporting huge gtt pages for the ppgtt, we introduce
page size members for gem objects.  We fill in the page sizes by
scanning the sg table.

v2: pass the sg_mask to set_pages

v3: calculate the sg_mask inline with populating the sg_table where
possible, and pass to set_pages along with the pages.

v4: bunch of improvements from Joonas

v5: fix num_pages blunder
    introduce i915_sg_page_sizes helper

v6: prefer GEM_BUG_ON(sizes == 0)

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>
Cc: Daniel Vetter <daniel@ffwll.ch>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171006145041.21673-7-matthew.auld@intel.com


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

drivers/gpu/drm/i915/i915_drv.h

+21 −1
Original line number Diff line number Diff line
@@ -2872,6 +2872,21 @@ static inline struct scatterlist *__sg_next(struct scatterlist *sg) 
	     (((__iter).curr += PAGE_SIZE) >= (__iter).max) ?		\

	     (__iter) = __sgt_iter(__sg_next((__iter).sgp), false), 0 : 0)



static inline unsigned int i915_sg_page_sizes(struct scatterlist *sg)

{

	unsigned int page_sizes;



	page_sizes = 0;

	while (sg) {

		GEM_BUG_ON(sg->offset);

		GEM_BUG_ON(!IS_ALIGNED(sg->length, PAGE_SIZE));

		page_sizes |= sg->length;

		sg = __sg_next(sg);

	}



	return page_sizes;

}



static inline unsigned int i915_sg_segment_size(void)

{

	unsigned int size = swiotlb_max_segment();
@@ -3101,6 +3116,10 @@ intel_info(const struct drm_i915_private *dev_priv) 
#define USES_PPGTT(dev_priv)		(i915_modparams.enable_ppgtt)

#define USES_FULL_PPGTT(dev_priv)	(i915_modparams.enable_ppgtt >= 2)

#define USES_FULL_48BIT_PPGTT(dev_priv)	(i915_modparams.enable_ppgtt == 3)

#define HAS_PAGE_SIZES(dev_priv, sizes) ({ \

	GEM_BUG_ON((sizes) == 0); \

	((sizes) & ~(dev_priv)->info.page_sizes) == 0; \

})



#define HAS_OVERLAY(dev_priv)		 ((dev_priv)->info.has_overlay)

#define OVERLAY_NEEDS_PHYSICAL(dev_priv) \
@@ -3517,7 +3536,8 @@ i915_gem_object_get_dma_address(struct drm_i915_gem_object *obj, 
				unsigned long n);



void __i915_gem_object_set_pages(struct drm_i915_gem_object *obj,

				 struct sg_table *pages);

				 struct sg_table *pages,

				 unsigned int sg_mask);

int __i915_gem_object_get_pages(struct drm_i915_gem_object *obj);



static inline int __must_check

drivers/gpu/drm/i915/i915_gem.c

+37 −5
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static int i915_gem_object_get_pages_phys(struct drm_i915_gem_object *obj) 


	obj->phys_handle = phys;



	__i915_gem_object_set_pages(obj, st);

	__i915_gem_object_set_pages(obj, st, sg->length);



	return 0;
@@ -2266,6 +2266,8 @@ void __i915_gem_object_put_pages(struct drm_i915_gem_object *obj, 
	if (!IS_ERR(pages))

		obj->ops->put_pages(obj, pages);



	obj->mm.page_sizes.phys = obj->mm.page_sizes.sg = 0;



unlock:

	mutex_unlock(&obj->mm.lock);

}
@@ -2308,6 +2310,7 @@ static int i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) 
	struct page *page;

	unsigned long last_pfn = 0;	/* suppress gcc warning */

	unsigned int max_segment = i915_sg_segment_size();

	unsigned int sg_mask;

	gfp_t noreclaim;

	int ret;
@@ -2339,6 +2342,7 @@ static int i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) 


	sg = st->sgl;

	st->nents = 0;

	sg_mask = 0;

	for (i = 0; i < page_count; i++) {

		const unsigned int shrink[] = {

			I915_SHRINK_BOUND | I915_SHRINK_UNBOUND | I915_SHRINK_PURGEABLE,
@@ -2391,8 +2395,10 @@ static int i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) 
		if (!i ||

		    sg->length >= max_segment ||

		    page_to_pfn(page) != last_pfn + 1) {

			if (i)

			if (i) {

				sg_mask |= sg->length;

				sg = sg_next(sg);

			}

			st->nents++;

			sg_set_page(sg, page, PAGE_SIZE, 0);

		} else {
@@ -2403,8 +2409,10 @@ static int i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) 
		/* Check that the i965g/gm workaround works. */

		WARN_ON((gfp & __GFP_DMA32) && (last_pfn >= 0x00100000UL));

	}

	if (sg) /* loop terminated early; short sg table */

	if (sg) { /* loop terminated early; short sg table */

		sg_mask |= sg->length;

		sg_mark_end(sg);

	}



	/* Trim unused sg entries to avoid wasting memory. */

	i915_sg_trim(st);
@@ -2433,7 +2441,7 @@ static int i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) 
	if (i915_gem_object_needs_bit17_swizzle(obj))

		i915_gem_object_do_bit_17_swizzle(obj, st);



	__i915_gem_object_set_pages(obj, st);

	__i915_gem_object_set_pages(obj, st, sg_mask);



	return 0;
@@ -2460,8 +2468,13 @@ static int i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) 
}



void __i915_gem_object_set_pages(struct drm_i915_gem_object *obj,

				 struct sg_table *pages)

				 struct sg_table *pages,

				 unsigned int sg_mask)

{

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

	unsigned long supported = INTEL_INFO(i915)->page_sizes;

	int i;



	lockdep_assert_held(&obj->mm.lock);



	obj->mm.get_page.sg_pos = pages->sgl;
@@ -2475,6 +2488,25 @@ void __i915_gem_object_set_pages(struct drm_i915_gem_object *obj, 
		__i915_gem_object_pin_pages(obj);

		obj->mm.quirked = true;

	}



	GEM_BUG_ON(!sg_mask);

	obj->mm.page_sizes.phys = sg_mask;



	/*

	 * Calculate the supported page-sizes which fit into the given sg_mask.

	 * This will give us the page-sizes which we may be able to use

	 * opportunistically when later inserting into the GTT. For example if

	 * phys=2G, then in theory we should be able to use 1G, 2M, 64K or 4K

	 * pages, although in practice this will depend on a number of other

	 * factors.

	 */

	obj->mm.page_sizes.sg = 0;

	for_each_set_bit(i, &supported, ilog2(I915_GTT_MAX_PAGE_SIZE) + 1) {

		if (obj->mm.page_sizes.phys & ~0u << i)

			obj->mm.page_sizes.sg |= BIT(i);

	}



	GEM_BUG_ON(!HAS_PAGE_SIZES(i915, obj->mm.page_sizes.sg));

}



static int ____i915_gem_object_get_pages(struct drm_i915_gem_object *obj)

drivers/gpu/drm/i915/i915_gem_dmabuf.c

+4 −1
Original line number Diff line number Diff line
@@ -259,13 +259,16 @@ struct dma_buf *i915_gem_prime_export(struct drm_device *dev, 
static int i915_gem_object_get_pages_dmabuf(struct drm_i915_gem_object *obj)

{

	struct sg_table *pages;

	unsigned int sg_mask;



	pages = dma_buf_map_attachment(obj->base.import_attach,

				       DMA_BIDIRECTIONAL);

	if (IS_ERR(pages))

		return PTR_ERR(pages);



	__i915_gem_object_set_pages(obj, pages);

	sg_mask = i915_sg_page_sizes(pages->sgl);



	__i915_gem_object_set_pages(obj, pages, sg_mask);



	return 0;

}

drivers/gpu/drm/i915/i915_gem_internal.c

+4 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ static int i915_gem_object_get_pages_internal(struct drm_i915_gem_object *obj) 
	struct drm_i915_private *i915 = to_i915(obj->base.dev);

	struct sg_table *st;

	struct scatterlist *sg;

	unsigned int sg_mask;

	unsigned int npages;

	int max_order;

	gfp_t gfp;
@@ -87,6 +88,7 @@ static int i915_gem_object_get_pages_internal(struct drm_i915_gem_object *obj) 


	sg = st->sgl;

	st->nents = 0;

	sg_mask = 0;



	do {

		int order = min(fls(npages) - 1, max_order);
@@ -104,6 +106,7 @@ static int i915_gem_object_get_pages_internal(struct drm_i915_gem_object *obj) 
		} while (1);



		sg_set_page(sg, page, PAGE_SIZE << order, 0);

		sg_mask |= PAGE_SIZE << order;

		st->nents++;



		npages -= 1 << order;
@@ -132,7 +135,7 @@ static int i915_gem_object_get_pages_internal(struct drm_i915_gem_object *obj) 
	 */

	obj->mm.madv = I915_MADV_DONTNEED;



	__i915_gem_object_set_pages(obj, st);

	__i915_gem_object_set_pages(obj, st, sg_mask);



	return 0;

drivers/gpu/drm/i915/i915_gem_object.h

+17 −0
Original line number Diff line number Diff line
@@ -169,6 +169,23 @@ struct drm_i915_gem_object { 
		struct sg_table *pages;

		void *mapping;



		struct i915_page_sizes {

			/**

			 * The sg mask of the pages sg_table. i.e the mask of

			 * of the lengths for each sg entry.

			 */

			unsigned int phys;



			/**

			 * The gtt page sizes we are allowed to use given the

			 * sg mask and the supported page sizes. This will

			 * express the smallest unit we can use for the whole

			 * object, as well as the larger sizes we may be able

			 * to use opportunistically.

			 */

			unsigned int sg;

		} page_sizes;



		struct i915_gem_object_page_iter {

			struct scatterlist *sg_pos;

			unsigned int sg_idx; /* in pages, but 32bit eek! */