[igt-dev] [PATCH i-g-t v2 4/5] tests/i915/query: sanity check reported GTT alignment

[Matthew Auld]

Ensure the kernel is reporting "normal" values here, based on our
current expectations.

v2:
 - Split the rsvd0 check out, so we can in theory land that patch by
   itself (since that will fix the kernel failure vs old igt and could
   be merged early).
 - s/4096/PAGE_SIZE/ (Nirmoy)

Signed-off-by: Matthew Auld <matthew.auld at intel.com>
Cc: Andrzej Hajda <andrzej.hajda at intel.com>
Cc: Nirmoy Das <nirmoy.das at intel.com>
Reviewed-by: Nirmoy Das <nirmoy.das at intel.com>
---
 tests/i915/i915_query.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/i915/i915_query.c b/tests/i915/i915_query.c
index 4e43c7cd..366427b4 100644
--- a/tests/i915/i915_query.c
+++ b/tests/i915/i915_query.c
@@ -30,6 +30,8 @@
 
 IGT_TEST_DESCRIPTION("Testing the i915 query uAPI.");
 
+#define PAGE_SIZE 4096
+
 /*
  * We should at least get 3 bytes for data for each slices, subslices & EUs
  * masks.
@@ -638,6 +640,8 @@ static void upload(int fd, struct igt_list_head *handles, uint32_t num_handles)
 	free(exec);
 }
 
+/** XXX: remove once we sync the uapi header */
+#define gtt_alignment rsvd0
 static void test_query_regions_sanity_check(int fd)
 {
 	struct drm_i915_query_memory_regions *regions;
@@ -664,6 +668,11 @@ static void test_query_regions_sanity_check(int fd)
 		struct drm_i915_gem_memory_class_instance r1 = info.region;
 		int j;
 
+		if (info.gtt_alignment) {
+			igt_assert_lte_u64(PAGE_SIZE, info.gtt_alignment);
+			igt_assert(is_power_of_two(info.gtt_alignment));
+		}
+
 		if (r1.memory_class == I915_MEMORY_CLASS_SYSTEM) {
 			igt_assert_eq(r1.memory_instance, 0);
 			found_system = true;
@@ -674,6 +683,9 @@ static void test_query_regions_sanity_check(int fd)
 			igt_assert(info.unallocated_cpu_visible_size == 0 ||
 				   info.unallocated_cpu_visible_size ==
 				   info.unallocated_size);
+
+			igt_assert(info.gtt_alignment == 0 ||
+				   info.gtt_alignment == PAGE_SIZE);
 		} else {
 			igt_assert(info.probed_cpu_visible_size <= info.probed_size);
 			igt_assert(info.unallocated_size <= info.probed_size);
-- 
2.37.3