Re: [PATCH i-g-t v2] tests/panthor: skip sparse VM_BIND tests before v1.9

[Deborah Brouwer <deborah.brouwer@collabora.com>]

On Mon, Sep 21, 2026 at 05:22:40PM +0200, Kamil Konieczny wrote:
> Hi Deborah,
> On 2026-09-20 at 17:59:09 -0700, Deborah Brouwer wrote:
> 
> I have one more nit, see below, and an ask for you or other
> panthor developers to look into igt work item on gitlab:
> 
> gputop does not work with the panthor kernel driver
> https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/work_items/209

Sure, I was able to reproduce this gputop problem today and will send
a fix separately.

> 
> > 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 { \
> 
> Can you make it a function in test? Macro seems an overkill.
> Also, it could be moved to library when there will be more
> users in other tests.
> 
> Regards,
> Kamil
> 
> > +	/* 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() {
> [cut]