Hi Matt,
On 10/3/2022 7:24 PM, Matthew Auld wrote:
Ensure the kernel is reporting "normal" values here, based on our
current expectations.
Signed-off-by: Matthew Auld <[email protected]>
Cc: Andrzej Hajda <[email protected]>
Cc: Nirmoy Das <[email protected]>
---
tests/i915/i915_query.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/tests/i915/i915_query.c b/tests/i915/i915_query.c
index b92d7593..bff073d2 100644
--- a/tests/i915/i915_query.c
+++ b/tests/i915/i915_query.c
@@ -581,8 +581,6 @@ static void test_query_regions_garbage_items(int fd)
struct drm_i915_memory_region_info info = regions->regions[i];
int j;
- igt_assert_eq_u32(info.rsvd0, 0);
-
/*
* rsvd1[0] : probed_cpu_visible_size
* rsvd1[1] : unallocated_cpu_visible_size
@@ -640,6 +638,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
Nit: use page PAGE_SIZE instead of 4096 in below
Otherwise the series is Reviewed-by: Nirmoy Das <[email protected]>
static void test_query_regions_sanity_check(int fd)
{
struct drm_i915_query_memory_regions *regions;
@@ -666,6 +666,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(4096, 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;
@@ -676,6 +681,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 == 4096);
} else {
igt_assert(info.probed_cpu_visible_size <=
info.probed_size);
igt_assert(info.unallocated_size <= info.probed_size);
