drm/i915/selftests: Extract random_offset() for use with a prng (dfe324f3) · Commits · 戴 / test

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

+9 −5

Original line number	Diff line number	Diff line
		@@ -1299,6 +1299,7 @@ static int igt_gtt_reserve(void *arg)
		{
		struct i915_ggtt *ggtt = arg;
		struct drm_i915_gem_object obj, on;
		I915_RND_STATE(prng);
		LIST_HEAD(objects);
		u64 total;
		int err = -ENODEV;
		@@ -1425,7 +1426,8 @@ static int igt_gtt_reserve(void *arg)
		goto out;
		}

		offset = random_offset(0, ggtt->vm.total,
		offset = igt_random_offset(&prng,
		0, ggtt->vm.total,
		2 * I915_GTT_PAGE_SIZE,
		I915_GTT_MIN_ALIGNMENT);

		@@ -1772,6 +1774,7 @@ static int igt_cs_tlb(void *arg)
		struct intel_context *ce;
		struct drm_file *file;
		struct i915_vma *vma;
		I915_RND_STATE(prng);
		unsigned int i;
		u32 *result;
		u32 *batch;
		@@ -1885,7 +1888,8 @@ static int igt_cs_tlb(void *arg)
		struct i915_request *rq;
		u64 offset;

		offset = random_offset(0, vm->total - PAGE_SIZE,
		offset = igt_random_offset(&prng,
		0, vm->total - PAGE_SIZE,
		chunk_size, PAGE_SIZE);

		err = vm->allocate_va_range(vm, offset, chunk_size);

+20 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@
		#include <linux/types.h>

		#include "i915_random.h"
		#include "i915_utils.h"

		u64 i915_prandom_u64_state(struct rnd_state *rnd)
		{
		@@ -87,3 +88,22 @@ unsigned int i915_random_order(unsigned int count, struct rnd_state state)
		i915_random_reorder(order, count, state);
		return order;
		}

		u64 igt_random_offset(struct rnd_state *state,
		u64 start, u64 end,
		u64 len, u64 align)
		{
		u64 range, addr;

		BUG_ON(range_overflows(start, len, end));
		BUG_ON(round_up(start, align) > round_down(end - len, align));

		range = round_down(end - len, align) - round_up(start, align);
		if (range) {
		addr = i915_prandom_u64_state(state);
		div64_u64_rem(addr, range, &addr);
		start += addr;
		}

		return round_up(start, align);
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -57,4 +57,8 @@ void i915_random_reorder(unsigned int *order,
		void i915_prandom_shuffle(void *arr, size_t elsz, size_t count,
		struct rnd_state *state);

		u64 igt_random_offset(struct rnd_state *state,
		u64 start, u64 end,
		u64 len, u64 align);

		#endif /* !__I915_SELFTESTS_RANDOM_H__ */