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

Commit c71ccbe2 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/gtt: Add some range asserts 



These should have been validated in the upper layers, but for sanity's
sake, repeat them.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190821155728.2839-2-chris@chris-wilson.co.uk
parent 1b9bd096

drivers/gpu/drm/i915/i915_gem_gtt.c

+11 −5
Original line number Diff line number Diff line
@@ -965,6 +965,8 @@ static u64 __gen8_ppgtt_clear(struct i915_address_space * const vm, 
	const struct i915_page_scratch * const scratch = &vm->scratch[lvl];

	unsigned int idx, len;



	GEM_BUG_ON(end > vm->total >> GEN8_PTE_SHIFT);



	len = gen8_pd_range(start, end, lvl--, &idx);

	DBG("%s(%p):{ lvl:%d, start:%llx, end:%llx, idx:%d, len:%d, used:%d }\n",

	    __func__, vm, lvl + 1, start, end,
@@ -1020,6 +1022,7 @@ static void gen8_ppgtt_clear(struct i915_address_space *vm, 
{

	GEM_BUG_ON(!IS_ALIGNED(start, BIT_ULL(GEN8_PTE_SHIFT)));

	GEM_BUG_ON(!IS_ALIGNED(length, BIT_ULL(GEN8_PTE_SHIFT)));

	GEM_BUG_ON(range_overflows(start, length, vm->total));



	start >>= GEN8_PTE_SHIFT;

	length >>= GEN8_PTE_SHIFT;
@@ -1031,13 +1034,15 @@ static void gen8_ppgtt_clear(struct i915_address_space *vm, 


static int __gen8_ppgtt_alloc(struct i915_address_space * const vm,

			      struct i915_page_directory * const pd,

			      u64 * const start, u64 end, int lvl)

			      u64 * const start, const u64 end, int lvl)

{

	const struct i915_page_scratch * const scratch = &vm->scratch[lvl];

	struct i915_page_table *alloc = NULL;

	unsigned int idx, len;

	int ret = 0;



	GEM_BUG_ON(end > vm->total >> GEN8_PTE_SHIFT);



	len = gen8_pd_range(*start, end, lvl--, &idx);

	DBG("%s(%p):{ lvl:%d, start:%llx, end:%llx, idx:%d, len:%d, used:%d }\n",

	    __func__, vm, lvl + 1, *start, end,
@@ -1131,6 +1136,7 @@ static int gen8_ppgtt_alloc(struct i915_address_space *vm, 


	GEM_BUG_ON(!IS_ALIGNED(start, BIT_ULL(GEN8_PTE_SHIFT)));

	GEM_BUG_ON(!IS_ALIGNED(length, BIT_ULL(GEN8_PTE_SHIFT)));

	GEM_BUG_ON(range_overflows(start, length, vm->total));



	start >>= GEN8_PTE_SHIFT;

	length >>= GEN8_PTE_SHIFT;