Commit f6e35cda authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Replace some PAGE_SIZE with I915_GTT_PAGE_SIZE 



Use I915_GTT_PAGE_SIZE when talking about GTT pages rather than
physical pages.

There are some PAGE_SHIFTs left though. Not sure if we want to
introduce I915_GTT_PAGE_SHIFT or what?

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Suggested-by: Chris Wilson <chris@chris-wilson.co.uk> # at least some of it :)
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180913150405.706-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 722f3de3

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -2283,7 +2283,7 @@ static inline struct scatterlist *__sg_next(struct scatterlist *sg) 
#define for_each_sgt_dma(__dmap, __iter, __sgt)				\

	for ((__iter) = __sgt_iter((__sgt)->sgl, true);			\

	     ((__dmap) = (__iter).dma + (__iter).curr);			\

	     (((__iter).curr += PAGE_SIZE) >= (__iter).max) ?		\

	     (((__iter).curr += I915_GTT_PAGE_SIZE) >= (__iter).max) ?	\

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



/**

drivers/gpu/drm/i915/i915_gem_gtt.c

+9 −9
Original line number Diff line number Diff line
@@ -1050,7 +1050,7 @@ gen8_ppgtt_insert_pte_entries(struct i915_hw_ppgtt *ppgtt, 
	do {

		vaddr[idx->pte] = pte_encode | iter->dma;



		iter->dma += PAGE_SIZE;

		iter->dma += I915_GTT_PAGE_SIZE;

		if (iter->dma >= iter->max) {

			iter->sg = __sg_next(iter->sg);

			if (!iter->sg) {
@@ -1759,7 +1759,7 @@ static void gen6_dump_ppgtt(struct i915_hw_ppgtt *base, struct seq_file *m) 


			seq_printf(m, "\t\t(%03d, %04d) %08lx: ",

				   pde, pte,

				   (pde * GEN6_PTES + pte) * PAGE_SIZE);

				   (pde * GEN6_PTES + pte) * I915_GTT_PAGE_SIZE);

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

				if (vaddr[pte + i] != scratch_pte)

					seq_printf(m, " %08x", vaddr[pte + i]);
@@ -1899,7 +1899,7 @@ static void gen6_ppgtt_insert_entries(struct i915_address_space *vm, 
	do {

		vaddr[act_pte] = pte_encode | GEN6_PTE_ADDR_ENCODE(iter.dma);



		iter.dma += PAGE_SIZE;

		iter.dma += I915_GTT_PAGE_SIZE;

		if (iter.dma == iter.max) {

			iter.sg = __sg_next(iter.sg);

			if (!iter.sg)
@@ -2037,7 +2037,7 @@ static int pd_vma_bind(struct i915_vma *vma, 
{

	struct i915_ggtt *ggtt = i915_vm_to_ggtt(vma->vm);

	struct gen6_hw_ppgtt *ppgtt = vma->private;

	u32 ggtt_offset = i915_ggtt_offset(vma) / PAGE_SIZE;

	u32 ggtt_offset = i915_ggtt_offset(vma) / I915_GTT_PAGE_SIZE;

	struct i915_page_table *pt;

	unsigned int pde;
@@ -2163,7 +2163,7 @@ static struct i915_hw_ppgtt *gen6_ppgtt_create(struct drm_i915_private *i915) 
	ppgtt->base.vm.i915 = i915;

	ppgtt->base.vm.dma = &i915->drm.pdev->dev;



	ppgtt->base.vm.total = I915_PDES * GEN6_PTES * PAGE_SIZE;

	ppgtt->base.vm.total = I915_PDES * GEN6_PTES * I915_GTT_PAGE_SIZE;



	i915_address_space_init(&ppgtt->base.vm, i915);
@@ -3023,7 +3023,7 @@ static unsigned int gen8_get_total_gtt_size(u16 bdw_gmch_ctl) 
		bdw_gmch_ctl = 1 << bdw_gmch_ctl;



#ifdef CONFIG_X86_32

	/* Limit 32b platforms to a 2GB GGTT: 4 << 20 / pte size * PAGE_SIZE */

	/* Limit 32b platforms to a 2GB GGTT: 4 << 20 / pte size * I915_GTT_PAGE_SIZE */

	if (bdw_gmch_ctl > 4)

		bdw_gmch_ctl = 4;

#endif
@@ -3727,9 +3727,9 @@ rotate_pages(const dma_addr_t *in, unsigned int offset, 
			 * the entries so the sg list can be happily traversed.

			 * The only thing we need are DMA addresses.

			 */

			sg_set_page(sg, NULL, PAGE_SIZE, 0);

			sg_set_page(sg, NULL, I915_GTT_PAGE_SIZE, 0);

			sg_dma_address(sg) = in[offset + src_idx];

			sg_dma_len(sg) = PAGE_SIZE;

			sg_dma_len(sg) = I915_GTT_PAGE_SIZE;

			sg = sg_next(sg);

			src_idx -= stride;

		}
@@ -3742,7 +3742,7 @@ static noinline struct sg_table * 
intel_rotate_pages(struct intel_rotation_info *rot_info,

		   struct drm_i915_gem_object *obj)

{

	const unsigned long n_pages = obj->base.size / PAGE_SIZE;

	const unsigned long n_pages = obj->base.size / I915_GTT_PAGE_SIZE;

	unsigned int size = intel_rotation_info_size(rot_info);

	struct sgt_iter sgt_iter;

	dma_addr_t dma_addr;

CRA Git | Maintained and supported by SUSTech CRA and CCSE