Re: [PATCH i-g-t v4 01/41] lib/drmtest: Add VKMS as a known driver type

[Louis Chauvet <louis.chauvet@bootlin.com>]

Le 07/08/2025 à 09:45, José Expósito a écrit :
> As we are going to add VKMS specific tests, allow to check if it is
> available.
> 
> Co-developed-by: Jim Shargo <jshargo@chromium.org>
> Signed-off-by: Jim Shargo <jshargo@chromium.org>
> Co-developed-by: Marius Vlad <marius.vlad@collabora.com>
> Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
> Signed-off-by: José Expósito <jose.exposito89@gmail.com>

Reviewed-by: Louis Chauvet <louis.chauvet@bootlin.com>

> ---
>   lib/drmtest.c | 21 +++++++++++++++++++++
>   lib/drmtest.h |  6 +++++-
>   2 files changed, 26 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/drmtest.c b/lib/drmtest.c
> index 436b6de78..943ea8dbe 100644
> --- a/lib/drmtest.c
> +++ b/lib/drmtest.c
> @@ -223,6 +223,7 @@ static const struct module {
>   	{ DRIVER_V3D, "v3d" },
>   	{ DRIVER_VC4, "vc4" },
>   	{ DRIVER_VGEM, "vgem" },
> +	{ DRIVER_VKMS, "vkms" },
>   	{ DRIVER_VMWGFX, "vmwgfx" },
>   	{ DRIVER_XE, "xe" },
>   	{}
> @@ -295,6 +296,8 @@ static const char *chipset_to_str(int chipset)
>   		return "xe";
>   	case DRIVER_VMWGFX:
>   		return "vmwgfx";
> +	case DRIVER_VKMS:
> +		return "vkms";
>   	case DRIVER_ANY:
>   		return "any";
>   	default:
> @@ -971,3 +974,21 @@ void igt_require_xe(int fd)
>   {
>   	igt_require(is_xe_device(fd));
>   }
> +
> +void igt_require_vkms(void)
> +{
> +	/*
> +	 * Since VKMS can create and destroy virtual drivers at will, instead
> +	 * look to make sure the driver is installed.
> +	 */
> +	struct stat s = {};
> +	int ret;
> +	const char *vkms_module_dir = "/sys/module/vkms";
> +
> +	ret = stat(vkms_module_dir, &s);
> +
> +	igt_require_f(ret == 0, "VKMS stat of %s returned %d (%s)\n",
> +		      vkms_module_dir, ret, strerror(ret));
> +	igt_require_f(S_ISDIR(s.st_mode),
> +		      "VKMS stat of %s was not a directory\n", vkms_module_dir);
> +}
> diff --git a/lib/drmtest.h b/lib/drmtest.h
> index 27e5a18e2..a9542dde2 100644
> --- a/lib/drmtest.h
> +++ b/lib/drmtest.h
> @@ -55,14 +55,17 @@ int __get_drm_device_name(int fd, char *name, int name_size);
>   #define DRIVER_MSM	(1 << 6)
>   #define DRIVER_XE	(1 << 7)
>   #define DRIVER_VMWGFX   (1 << 8)
> +#define DRIVER_VKMS	(1 << 9)
>   
>   /*
>    * Exclude DRVER_VGEM from DRIVER_ANY since if you run on a system
>    * with vgem as well as a supported driver, you can end up with a
>    * near-100% skip rate if you don't explicitly specify the device,
>    * depending on device-load ordering.
> + *
> + * Exclude VKMS to prefer hardware drivers.
>    */
> -#define DRIVER_ANY 	~(DRIVER_VGEM)
> +#define DRIVER_ANY	~(DRIVER_VGEM | DRIVER_VKMS)
>   
>   /*
>    * Compile friendly enum for i915/xe.
> @@ -135,6 +138,7 @@ void igt_require_i915(int fd);
>   void igt_require_nouveau(int fd);
>   void igt_require_vc4(int fd);
>   void igt_require_xe(int fd);
> +void igt_require_vkms(void);
>   
>   bool is_amdgpu_device(int fd);
>   bool is_i915_device(int fd);

-- 
Louis Chauvet, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com