All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chris Wilson <chris@chris-wilson.co.uk>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 23/46] drm/i915: Test partial mappings
Date: Thu,  2 Feb 2017 09:08:42 +0000	[thread overview]
Message-ID: <20170202090905.29028-24-chris@chris-wilson.co.uk> (raw)
In-Reply-To: <20170202090905.29028-1-chris@chris-wilson.co.uk>

Create partial mappings to cover a large object, investigating tiling
(fenced regions) and VMA reuse.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
---
 drivers/gpu/drm/i915/selftests/i915_gem_object.c | 293 +++++++++++++++++++++++
 1 file changed, 293 insertions(+)

diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_object.c b/drivers/gpu/drm/i915/selftests/i915_gem_object.c
index d7330db70063..140bae2c8ad2 100644
--- a/drivers/gpu/drm/i915/selftests/i915_gem_object.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem_object.c
@@ -140,6 +140,298 @@ static int igt_gem_huge(void *arg)
 	return err;
 }
 
+struct tile {
+	unsigned int width;
+	unsigned int height;
+	unsigned int stride;
+	unsigned int size;
+	unsigned int tiling;
+	unsigned int swizzle;
+};
+
+static u64 swizzle_bit(unsigned int bit, u64 offset)
+{
+	return (offset & BIT_ULL(bit)) >> (bit - 6);
+}
+
+static u64 tiled_offset(const struct tile *tile, u64 v)
+{
+	u64 x, y;
+
+	if (tile->tiling == I915_TILING_NONE)
+		return v;
+
+	y = div64_u64_rem(v, tile->stride, &x);
+	v = div64_u64_rem(y, tile->height, &y) * tile->stride * tile->height;
+
+	if (tile->tiling == I915_TILING_X) {
+		v += y * tile->width;
+		v += div64_u64_rem(x, tile->width, &x) << tile->size;
+		v += x;
+	} else {
+		const unsigned int ytile_span = 16;
+		const unsigned int ytile_height = 32 * ytile_span;
+
+		v += y * ytile_span;
+		v += div64_u64_rem(x, ytile_span, &x) * ytile_height;
+		v += x;
+	}
+
+	switch (tile->swizzle) {
+	case I915_BIT_6_SWIZZLE_9:
+		v ^= swizzle_bit(9, v);
+		break;
+	case I915_BIT_6_SWIZZLE_9_10:
+		v ^= swizzle_bit(9, v) ^ swizzle_bit(10, v);
+		break;
+	case I915_BIT_6_SWIZZLE_9_11:
+		v ^= swizzle_bit(9, v) ^ swizzle_bit(11, v);
+		break;
+	case I915_BIT_6_SWIZZLE_9_10_11:
+		v ^= swizzle_bit(9, v) ^ swizzle_bit(10, v) ^ swizzle_bit(11, v);
+		break;
+	}
+
+	return v;
+}
+
+static int check_partial_mapping(struct drm_i915_gem_object *obj,
+				 const struct tile *tile,
+				 unsigned long end_time)
+{
+	const unsigned int nreal = obj->scratch / PAGE_SIZE;
+	const unsigned long npages = obj->base.size / PAGE_SIZE;
+	struct i915_vma *vma;
+	unsigned long page;
+	int err;
+
+	if (igt_timeout(end_time,
+			"%s: timed out before tiling=%d stride=%d\n",
+			__func__, tile->tiling, tile->stride))
+		return -EINTR;
+
+	err = i915_gem_object_set_tiling(obj, tile->tiling, tile->stride);
+	if (err)
+		return err;
+
+	GEM_BUG_ON(i915_gem_object_get_tiling(obj) != tile->tiling);
+	GEM_BUG_ON(i915_gem_object_get_stride(obj) != tile->stride);
+
+	for_each_prime_number_from(page, 1, npages) {
+		struct i915_ggtt_view view =
+			compute_partial_view(obj, page, MIN_CHUNK_PAGES);
+		u32 __iomem *io;
+		struct page *p;
+		unsigned int n;
+		u64 offset;
+		u32 *cpu;
+
+		GEM_BUG_ON(view.partial.size > nreal);
+
+		err = i915_gem_object_set_to_gtt_domain(obj, true);
+		if (err)
+			return err;
+
+		vma = i915_gem_object_ggtt_pin(obj, &view, 0, 0, PIN_MAPPABLE);
+		if (IS_ERR(vma)) {
+			pr_err("Failed to pin partial view: offset=%lu\n",
+			       page);
+			return PTR_ERR(vma);
+		}
+
+		n = page - view.partial.offset;
+		GEM_BUG_ON(n >= view.partial.size);
+
+		io = i915_vma_pin_iomap(vma);
+		i915_vma_unpin(vma);
+		if (IS_ERR(io)) {
+			pr_err("Failed to iomap partial view: offset=%lu\n",
+			       page);
+			return PTR_ERR(io);
+		}
+
+		err = i915_vma_get_fence(vma);
+		if (err) {
+			pr_err("Failed to get fence for partial view: offset=%lu\n",
+			       page);
+			i915_vma_unpin_iomap(vma);
+			return err;
+		}
+
+		iowrite32(page, io + n * PAGE_SIZE/sizeof(*io));
+		i915_vma_unpin_iomap(vma);
+
+		offset = tiled_offset(tile, page << PAGE_SHIFT);
+		if (offset >= obj->base.size)
+			continue;
+
+		i915_gem_object_flush_gtt_write_domain(obj);
+
+		p = i915_gem_object_get_page(obj, offset >> PAGE_SHIFT);
+		cpu = kmap(p) + offset_in_page(offset);
+		drm_clflush_virt_range(cpu, sizeof(*cpu));
+		if (*cpu != (u32)page) {
+			pr_err("Partial view for %lu [%u] (offset=%llu, size=%u [%llu, row size %u], fence=%d, tiling=%d, stride=%d) misalignment, expected write to page (%llu + %u [0x%llx]) of 0x%x, found 0x%x\n",
+			       page, n,
+			       view.partial.offset,
+			       view.partial.size,
+			       vma->size >> PAGE_SHIFT,
+			       tile_row_pages(obj),
+			       vma->fence ? vma->fence->id : -1, tile->tiling, tile->stride,
+			       offset >> PAGE_SHIFT,
+			       (unsigned int)offset_in_page(offset),
+			       offset,
+			       (u32)page, *cpu);
+			err = -EINVAL;
+		}
+		*cpu = 0;
+		drm_clflush_virt_range(cpu, sizeof(*cpu));
+		kunmap(p);
+		if (err)
+			return err;
+	}
+
+	return 0;
+}
+
+static int igt_partial_tiling(void *arg)
+{
+	const unsigned int nreal = 1 << 12; /* largest tile row x2 */
+	struct drm_i915_private *i915 = arg;
+	struct drm_i915_gem_object *obj;
+	int tiling;
+	int err;
+
+	/* We want to check the page mapping and fencing of a large object
+	 * mmapped through the GTT. The object we create is larger than can
+	 * possibly be mmaped as a whole, and so we must use partial GGTT vma.
+	 * We then check that a write through each partial GGTT vma ends up
+	 * in the right set of pages within the object, and with the expected
+	 * tiling, which we verify by manual swizzling.
+	 */
+
+	obj = huge_gem_object(i915,
+			      nreal << PAGE_SHIFT,
+			      (1 + next_prime_number(i915->ggtt.base.total >> PAGE_SHIFT)) << PAGE_SHIFT);
+	if (IS_ERR(obj))
+		return PTR_ERR(obj);
+
+	err = i915_gem_object_pin_pages(obj);
+	if (err) {
+		pr_err("Failed to allocate %u pages (%lu total), err=%d\n",
+		       nreal, obj->base.size / PAGE_SIZE, err);
+		goto out;
+	}
+
+	mutex_lock(&i915->drm.struct_mutex);
+
+	if (1) {
+		IGT_TIMEOUT(end);
+		struct tile tile;
+
+		tile.height = 1;
+		tile.width = 1;
+		tile.size = 0;
+		tile.stride = 0;
+		tile.swizzle = I915_BIT_6_SWIZZLE_NONE;
+		tile.tiling = I915_TILING_NONE;
+
+		err = check_partial_mapping(obj, &tile, end);
+		if (err && err != -EINTR)
+			goto out_unlock;
+	}
+
+	for (tiling = I915_TILING_X; tiling <= I915_TILING_Y; tiling++) {
+		IGT_TIMEOUT(end);
+		unsigned int max_pitch;
+		unsigned int pitch;
+		struct tile tile;
+
+		tile.tiling = tiling;
+		switch (tiling) {
+		case I915_TILING_X:
+			tile.swizzle = i915->mm.bit_6_swizzle_x;
+			break;
+		case I915_TILING_Y:
+			tile.swizzle = i915->mm.bit_6_swizzle_y;
+			break;
+		}
+
+		if (tile.swizzle == I915_BIT_6_SWIZZLE_UNKNOWN ||
+		    tile.swizzle == I915_BIT_6_SWIZZLE_9_10_17)
+			continue;
+
+		if (INTEL_GEN(i915) <= 2) {
+			tile.height = 16;
+			tile.width = 128;
+			tile.size = 11;
+		} else if (tile.tiling == I915_TILING_Y &&
+			   HAS_128_BYTE_Y_TILING(i915)) {
+			tile.height = 32;
+			tile.width = 128;
+			tile.size = 12;
+		} else {
+			tile.height = 8;
+			tile.width = 512;
+			tile.size = 12;
+		}
+
+		if (INTEL_GEN(i915) < 4)
+			max_pitch = 8192 / tile.width;
+		else if (INTEL_GEN(i915) < 7)
+			max_pitch = 128 * I965_FENCE_MAX_PITCH_VAL / tile.width;
+		else
+			max_pitch = 128 * GEN7_FENCE_MAX_PITCH_VAL / tile.width;
+
+		for (pitch = max_pitch; pitch; pitch >>= 1) {
+			tile.stride = tile.width * pitch;
+			err = check_partial_mapping(obj, &tile, end);
+			if (err == -EINTR)
+				goto next_tiling;
+			if (err)
+				goto out_unlock;
+
+			if (pitch > 2 && INTEL_GEN(i915) >= 4) {
+				tile.stride = tile.width * (pitch - 1);
+				err = check_partial_mapping(obj, &tile, end);
+				if (err == -EINTR)
+					goto next_tiling;
+				if (err)
+					goto out_unlock;
+			}
+
+			if (pitch < max_pitch && INTEL_GEN(i915) >= 4) {
+				tile.stride = tile.width * (pitch + 1);
+				err = check_partial_mapping(obj, &tile, end);
+				if (err == -EINTR)
+					goto next_tiling;
+				if (err)
+					goto out_unlock;
+			}
+		}
+
+		if (INTEL_GEN(i915) >= 4) {
+			for_each_prime_number(pitch, max_pitch) {
+				tile.stride = tile.width * pitch;
+				err = check_partial_mapping(obj, &tile, end);
+				if (err == -EINTR)
+					goto next_tiling;
+				if (err)
+					goto out_unlock;
+			}
+		}
+
+next_tiling: ;
+	}
+
+out_unlock:
+	mutex_unlock(&i915->drm.struct_mutex);
+	i915_gem_object_unpin_pages(obj);
+out:
+	i915_gem_object_put(obj);
+	return err;
+}
+
 int i915_gem_object_mock_selftests(void)
 {
 	static const struct i915_subtest tests[] = {
@@ -163,6 +455,7 @@ int i915_gem_object_live_selftests(struct drm_i915_private *i915)
 {
 	static const struct i915_subtest tests[] = {
 		SUBTEST(igt_gem_huge),
+		SUBTEST(igt_partial_tiling),
 	};
 
 	return i915_subtests(tests, i915);
-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2017-02-02  9:09 UTC|newest]

Thread overview: 81+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-02  9:08 Moah selftests Chris Wilson
2017-02-02  9:08 ` [PATCH 01/46] drm: Provide a driver hook for drm_dev_release() Chris Wilson
2017-02-02  9:24   ` Laurent Pinchart
2017-02-02  9:36   ` [PATCH v6] " Chris Wilson
2017-02-02  9:44     ` Daniel Vetter
2017-02-02  9:08 ` [PATCH 02/46] drm/i915: Split device release from unload Chris Wilson
2017-02-08 13:41   ` Joonas Lahtinen
2017-02-02  9:08 ` [PATCH 03/46] drm/i915: Unbind any residual objects/vma from the Global GTT on shutdown Chris Wilson
2017-02-08 13:36   ` Joonas Lahtinen
2017-02-02  9:08 ` [PATCH 04/46] drm/i915: Flush the freed object queue on device release Chris Wilson
2017-02-08 13:38   ` Joonas Lahtinen
2017-02-02  9:08 ` [PATCH 05/46] drm/i915: Provide a hook for selftests Chris Wilson
2017-02-02  9:11   ` Chris Wilson
2017-02-10 10:19   ` Tvrtko Ursulin
2017-02-10 10:36     ` Chris Wilson
2017-02-02  9:08 ` [PATCH 06/46] drm/i915: Add some selftests for sg_table manipulation Chris Wilson
2017-02-10 10:24   ` Tvrtko Ursulin
2017-02-10 10:43     ` Chris Wilson
2017-02-10 12:01       ` Tvrtko Ursulin
2017-02-02  9:08 ` [PATCH 07/46] drm/i915: Add unit tests for the breadcrumb rbtree, insert/remove Chris Wilson
2017-02-02  9:08 ` [PATCH 08/46] drm/i915: Add unit tests for the breadcrumb rbtree, completion Chris Wilson
2017-02-02  9:08 ` [PATCH 09/46] drm/i915: Add unit tests for the breadcrumb rbtree, wakeups Chris Wilson
2017-02-02 12:49   ` Tvrtko Ursulin
2017-02-02 13:02     ` Chris Wilson
2017-02-02  9:08 ` [PATCH 10/46] drm/i915: Mock the GEM device for self-testing Chris Wilson
2017-02-02  9:08 ` [PATCH 11/46] drm/i915: Mock a GGTT " Chris Wilson
2017-02-02  9:08 ` [PATCH 12/46] drm/i915: Mock infrastructure for request emission Chris Wilson
2017-02-02  9:08 ` [PATCH 13/46] drm/i915: Create a fake object for testing huge allocations Chris Wilson
2017-02-02  9:08 ` [PATCH 14/46] drm/i915: Add selftests for i915_gem_request Chris Wilson
2017-02-02  9:08 ` [PATCH 15/46] drm/i915: Add a simple request selftest for waiting Chris Wilson
2017-02-02  9:08 ` [PATCH 16/46] drm/i915: Add a simple fence selftest to i915_gem_request Chris Wilson
2017-02-02  9:08 ` [PATCH 17/46] drm/i915: Simple selftest to exercise live requests Chris Wilson
2017-02-02  9:08 ` [PATCH 18/46] drm/i915: Test simultaneously submitting requests to all engines Chris Wilson
2017-02-02  9:08 ` [PATCH 19/46] drm/i915: Test request ordering between engines Chris Wilson
2017-02-09 10:20   ` Joonas Lahtinen
2017-02-02  9:08 ` [PATCH 20/46] drm/i915: Live testing of empty requests Chris Wilson
2017-02-09 10:30   ` Joonas Lahtinen
2017-02-02  9:08 ` [PATCH 21/46] drm/i915: Add selftests for object allocation, phys Chris Wilson
2017-02-02 13:10   ` Matthew Auld
2017-02-02 13:20     ` Chris Wilson
2017-02-02  9:08 ` [PATCH 22/46] drm/i915: Add a live seftest for GEM objects Chris Wilson
2017-02-02  9:08 ` Chris Wilson [this message]
2017-02-02  9:08 ` [PATCH 24/46] drm/i915: Test exhaustion of the mmap space Chris Wilson
2017-02-02  9:08 ` [PATCH 25/46] drm/i915: Test coherency of and barriers between cache domains Chris Wilson
2017-02-02  9:08 ` [PATCH 26/46] drm/i915: Move uncore selfchecks to live selftest infrastructure Chris Wilson
2017-02-02  9:08 ` [PATCH 27/46] drm/i915: Test all fw tables during mock selftests Chris Wilson
2017-02-02  9:08 ` [PATCH 28/46] drm/i915: Sanity check all registers for matching fw domains Chris Wilson
2017-02-02  9:08 ` [PATCH 29/46] drm/i915: Add some mock tests for dmabuf interop Chris Wilson
2017-02-02  9:08 ` [PATCH 30/46] drm/i915: Add a live dmabuf selftest Chris Wilson
2017-02-09 10:59   ` Joonas Lahtinen
2017-02-02  9:08 ` [PATCH 31/46] drm/i915: Add initial selftests for i915_gem_gtt Chris Wilson
2017-02-02  9:08 ` [PATCH 32/46] drm/i915: Exercise filling the top/bottom portions of the ppgtt Chris Wilson
2017-02-09 10:49   ` Joonas Lahtinen
2017-02-02  9:08 ` [PATCH 33/46] drm/i915: Exercise filling the top/bottom portions of the global GTT Chris Wilson
2017-02-02  9:08 ` [PATCH 34/46] drm/i915: Fill different pages of the GTT Chris Wilson
2017-02-02  9:08 ` [PATCH 35/46] drm/i915: Exercise filling and removing random ranges from the live GTT Chris Wilson
2017-02-02  9:08 ` [PATCH 36/46] drm/i915: Test creation of VMA Chris Wilson
2017-02-02  9:08 ` [PATCH 37/46] drm/i915: Exercise i915_vma_pin/i915_vma_insert Chris Wilson
2017-02-02  9:08 ` [PATCH 38/46] drm/i915: Verify page layout for rotated VMA Chris Wilson
2017-02-02 13:01   ` Tvrtko Ursulin
2017-02-02  9:08 ` [PATCH 39/46] drm/i915: Test creation of partial VMA Chris Wilson
2017-02-02  9:08 ` [PATCH 40/46] drm/i915: Live testing for context execution Chris Wilson
2017-02-02  9:09 ` [PATCH 41/46] drm/i915: Initial selftests for exercising eviction Chris Wilson
2017-02-02  9:09 ` [PATCH 42/46] drm/i915: Add mock exercise for i915_gem_gtt_reserve Chris Wilson
2017-02-02  9:09 ` [PATCH 43/46] drm/i915: Add mock exercise for i915_gem_gtt_insert Chris Wilson
2017-02-02  9:09 ` [PATCH 44/46] drm/i915: Add mock tests for GTT/VMA handling Chris Wilson
2017-02-08 12:12   ` Matthew Auld
2017-02-09 10:53   ` Joonas Lahtinen
2017-02-02  9:09 ` [PATCH 45/46] drm/i915: Exercise manipulate of single pages in the GGTT Chris Wilson
2017-02-08 12:25   ` Matthew Auld
2017-02-08 12:33     ` Chris Wilson
2017-02-02  9:09 ` [PATCH 46/46] drm/i915: Add initial selftests for hang detection and resets Chris Wilson
2017-02-02 13:28   ` Mika Kuoppala
2017-02-02  9:18 ` [PATCH igt] intel-ci: Add all driver selftests to BAT Chris Wilson
2017-02-02 13:30   ` Maarten Lankhorst
2017-02-02 13:44     ` Chris Wilson
2017-02-02 14:11       ` Maarten Lankhorst
2017-02-02 15:42       ` Saarinen, Jani
2017-02-17 11:50   ` Petri Latvala
2017-02-17 11:57     ` Chris Wilson
2017-02-02 11:32 ` ✗ Fi.CI.BAT: failure for series starting with [v6] drm: Provide a driver hook for drm_dev_release() (rev2) Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170202090905.29028-24-chris@chris-wilson.co.uk \
    --to=chris@chris-wilson.co.uk \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.