All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH i-g-t v2] tests/panthor: skip sparse VM_BIND tests before v1.9
@ 2026-09-21  0:59 Deborah Brouwer
  2026-09-21  2:30 ` ✗ Xe.CI.BAT: failure for " Patchwork
                   ` (5 more replies)
  0 siblings, 6 replies; 9+ messages in thread
From: Deborah Brouwer @ 2026-09-21  0:59 UTC (permalink / raw)
  To: igt-dev
  Cc: dri-devel, boris.brezillon, steven.price, liviu.dudau,
	adrian.larumbe, kamil.konieczny, samitolvanen, Deborah Brouwer

Sparse VM_BIND support was introduced with Panthor DRM driver version
1.9. If a driver isn't advertising support for v1.9, skip the sparse
VM_BIND subtests.

Use the advertised driver version rather than probing for EINVAL, since
EINVAL may also indicate a uAPI regression rather than lack of support for
sparse VM_BIND.

Add a shared macro igt_require_panthor_version() to check the version in
case other Panthor tests would like to use it in the future.

The Panthor version macro wraps the igt_require_f() macro so that we can
clear the last errno. The last errno is irrelevant to the version check
but __igt_skip_check() will still print it like this:

  Starting subtest: vm_bind_sparse
  Test requirement not met in function __igt_unique____real_main10, file ../tests/panthor/panthor_vm.c:296:
  Test requirement: __igt_panthor_driver_version_at_least(fd, 1, 9)
  Requires Panthor version 1.9 or newer
  Last errno: 2, No such file or directory
  Subtest vm_bind_sparse: SKIP (0.000s)

This makes the log noisier than it already is. So set the errno to 0 to
suppress that line. Skipping the test will now print:

  Starting subtest: vm_bind_sparse
  Test requirement not met in function __igt_unique____real_main10, file ../tests/panthor/panthor_vm.c:296:
  Test requirement: __igt_panthor_driver_version_at_least(fd, 1, 9)
  Requires Panthor version 1.9 or newer
  Subtest vm_bind_sparse: SKIP (0.000s)

Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
---
Changes in v2:
- check for version at each subtest
- make version check available to all panthor tests
- use macro to suppress printing the last error
- Link to v1: https://lore.kernel.org/r/20260915-b4-panthor_version_sparse-v1-1-7ac10b75e631@collabora.com
---
 lib/igt_panthor.c          | 14 ++++++++++++++
 lib/igt_panthor.h          | 18 ++++++++++++++++++
 tests/panthor/panthor_vm.c | 18 ++++++++++++++++++
 3 files changed, 50 insertions(+)

diff --git a/lib/igt_panthor.c b/lib/igt_panthor.c
index 11d8ec342..0f8c408d5 100644
--- a/lib/igt_panthor.c
+++ b/lib/igt_panthor.c
@@ -385,3 +385,17 @@ void igt_panthor_free_bo(int fd, struct panthor_bo *bo)
 
 	gem_close(fd, bo->handle);
 }
+
+bool __igt_panthor_driver_version_at_least(int fd, int major, int minor)
+{
+	drmVersionPtr version = drmGetVersion(fd);
+	bool supported;
+
+	igt_assert(version);
+	supported = version->version_major > major ||
+		    (version->version_major == major &&
+		     version->version_minor >= minor);
+	drmFreeVersion(version);
+
+	return supported;
+}
diff --git a/lib/igt_panthor.h b/lib/igt_panthor.h
index ba4a9bf1e..626e5d525 100644
--- a/lib/igt_panthor.h
+++ b/lib/igt_panthor.h
@@ -37,6 +37,24 @@ void igt_panthor_group_submit_simple(int fd, uint32_t group_handle,
 				     uint32_t stream_size, uint32_t syncobj_handle,
 				     int err);
 uint64_t igt_panthor_get_first_core(uint64_t cores_present);
+bool __igt_panthor_driver_version_at_least(int fd, int major, int minor);
+
+/**
+ * igt_require_panthor_version:
+ * @fd: device file descriptor
+ * @major: required Panthor major version
+ * @minor: required Panthor minor version
+ *
+ * Require the Panthor version to be at least the requested version.
+ */
+#define igt_require_panthor_version(fd, major, minor) do { \
+	/* igt_require_f() reports errno through __igt_skip_check(); */ \
+	/* clear it since errno is unrelated to the version check. */ \
+	errno = 0; \
+	igt_require_f(__igt_panthor_driver_version_at_least(fd, major, minor), \
+		      "Requires Panthor version %d.%d or newer\n", \
+		      major, minor); \
+} while (0)
 
 static inline void igt_panthor_vm_bind(int fd, uint32_t vm_id, uint32_t bo_handle,
 				       uint64_t va, uint64_t size, uint32_t flags, int err)
diff --git a/tests/panthor/panthor_vm.c b/tests/panthor/panthor_vm.c
index 9011df25e..bd8f14ecb 100644
--- a/tests/panthor/panthor_vm.c
+++ b/tests/panthor/panthor_vm.c
@@ -293,6 +293,7 @@ int igt_main() {
 		uint32_t vm_id;
 		uint64_t map_size = SZ_4K * 4;
 
+		igt_require_panthor_version(fd, 1, 9);
 		igt_panthor_vm_create(fd, &vm_id, 0);
 		igt_assert(vm_id != 0);
 
@@ -306,6 +307,7 @@ int igt_main() {
 		uint64_t map_size = SZ_2M * 3;
 		const int INITIAL_VA = SZ_4M;
 
+		igt_require_panthor_version(fd, 1, 9);
 		igt_panthor_vm_create(fd, &vm_id, 0);
 		igt_assert(vm_id != 0);
 
@@ -321,6 +323,7 @@ int igt_main() {
 		uint64_t map_size = SZ_2M * 3;
 		const int INITIAL_VA = SZ_4M;
 
+		igt_require_panthor_version(fd, 1, 9);
 		igt_panthor_vm_create(fd, &vm_id, 0);
 		igt_assert(vm_id != 0);
 
@@ -336,6 +339,7 @@ int igt_main() {
 		uint64_t map_size = SZ_2M * 3;
 		const int INITIAL_VA = SZ_4M;
 
+		igt_require_panthor_version(fd, 1, 9);
 		igt_panthor_vm_create(fd, &vm_id, 0);
 		igt_assert(vm_id != 0);
 
@@ -351,6 +355,7 @@ int igt_main() {
 		uint64_t map_size = SZ_2M * 3;
 		const int INITIAL_VA = SZ_4M;
 
+		igt_require_panthor_version(fd, 1, 9);
 		igt_panthor_vm_create(fd, &vm_id, 0);
 		igt_assert(vm_id != 0);
 
@@ -366,6 +371,7 @@ int igt_main() {
 		uint64_t map_size = SZ_2M * 3;
 		const int INITIAL_VA = SZ_4M;
 
+		igt_require_panthor_version(fd, 1, 9);
 		igt_panthor_vm_create(fd, &vm_id, 0);
 		igt_assert(vm_id != 0);
 
@@ -382,6 +388,7 @@ int igt_main() {
 		uint64_t map_size = SZ_2M * 3;
 		const int INITIAL_VA = SZ_4M;
 
+		igt_require_panthor_version(fd, 1, 9);
 		igt_panthor_vm_create(fd, &vm_id, 0);
 		igt_assert(vm_id != 0);
 
@@ -402,6 +409,7 @@ int igt_main() {
 		uint64_t map_size = SZ_2M * 3;
 		const int INITIAL_VA = SZ_4M;
 
+		igt_require_panthor_version(fd, 1, 9);
 		igt_panthor_vm_create(fd, &vm_id, 0);
 		igt_assert(vm_id != 0);
 
@@ -422,6 +430,7 @@ int igt_main() {
 		uint64_t map_size = SZ_2M * 3;
 		const int INITIAL_VA = SZ_4M;
 
+		igt_require_panthor_version(fd, 1, 9);
 		igt_panthor_vm_create(fd, &vm_id, 0);
 		igt_assert(vm_id != 0);
 
@@ -442,6 +451,7 @@ int igt_main() {
 		uint64_t map_size = SZ_2M * 3;
 		const int INITIAL_VA = SZ_4M;
 
+		igt_require_panthor_version(fd, 1, 9);
 		igt_panthor_vm_create(fd, &vm_id, 0);
 		igt_assert(vm_id != 0);
 
@@ -463,6 +473,7 @@ int igt_main() {
 		uint64_t map_size = SZ_2M * 3;
 		const int INITIAL_VA = SZ_4M;
 
+		igt_require_panthor_version(fd, 1, 9);
 		igt_panthor_vm_create(fd, &vm_id, 0);
 		igt_assert(vm_id != 0);
 
@@ -483,6 +494,7 @@ int igt_main() {
 		uint64_t map_size = SZ_2M * 3;
 		const int INITIAL_VA = SZ_4M;
 
+		igt_require_panthor_version(fd, 1, 9);
 		igt_panthor_vm_create(fd, &vm_id, 0);
 		igt_assert(vm_id != 0);
 
@@ -503,6 +515,7 @@ int igt_main() {
 		uint64_t map_size = SZ_2M * 3;
 		const int INITIAL_VA = SZ_4M;
 
+		igt_require_panthor_version(fd, 1, 9);
 		igt_panthor_vm_create(fd, &vm_id, 0);
 		igt_assert(vm_id != 0);
 
@@ -524,6 +537,7 @@ int igt_main() {
 		uint64_t map_size = SZ_2M * 3;
 		const int INITIAL_VA = SZ_4M;
 
+		igt_require_panthor_version(fd, 1, 9);
 		igt_panthor_vm_create(fd, &vm_id, 0);
 		igt_assert(vm_id != 0);
 
@@ -545,6 +559,7 @@ int igt_main() {
 		uint64_t map_size = SZ_2M * 3;
 		const int INITIAL_VA = SZ_4M;
 
+		igt_require_panthor_version(fd, 1, 9);
 		igt_panthor_vm_create(fd, &vm_id, 0);
 		igt_assert(vm_id != 0);
 
@@ -566,6 +581,7 @@ int igt_main() {
 		uint64_t map_size = SZ_2M * 3;
 		const int INITIAL_VA = SZ_4M;
 
+		igt_require_panthor_version(fd, 1, 9);
 		igt_panthor_vm_create(fd, &vm_id, 0);
 		igt_assert(vm_id != 0);
 
@@ -585,6 +601,7 @@ int igt_main() {
 		uint64_t map_size = ALIGN_DOWN(UINT64_MAX, SZ_2M) - (SZ_2M * 3);
 		const int INITIAL_VA = SZ_512M;
 
+		igt_require_panthor_version(fd, 1, 9);
 		igt_panthor_vm_create(fd, &vm_id, 0);
 		igt_assert(vm_id != 0);
 
@@ -599,6 +616,7 @@ int igt_main() {
 		uint64_t unmap_size = ALIGN_DOWN(UINT64_MAX, SZ_2M) - map_size;
 		const int INITIAL_VA = SZ_512M;
 
+		igt_require_panthor_version(fd, 1, 9);
 		igt_panthor_vm_create(fd, &vm_id, 0);
 		igt_assert(vm_id != 0);
 

---
base-commit: 970700a95acd74bb987287d10147b5f23380519b
change-id: 20260915-b4-panthor_version_sparse-5fbd31cc0d5d

Best regards,
-- 
Deborah Brouwer <deborah.brouwer@collabora.com>


^ permalink raw reply related	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2026-09-22  3:08 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-09-21  0:59 [PATCH i-g-t v2] tests/panthor: skip sparse VM_BIND tests before v1.9 Deborah Brouwer
2026-09-21  2:30 ` ✗ Xe.CI.BAT: failure for " Patchwork
2026-09-21  2:54 ` ✗ i915.CI.BAT: " Patchwork
2026-09-21  3:52 ` ✗ Xe.CI.FULL: " Patchwork
2026-09-21  6:54 ` [PATCH i-g-t v2] " Boris Brezillon
2026-09-22  3:07   ` Deborah Brouwer
2026-09-21 13:59 ` Kamil Konieczny
2026-09-21 15:22 ` Kamil Konieczny
2026-09-22  3:08   ` Deborah Brouwer

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.