From: "José Expósito" <jose.exposito89@gmail.com>
To: igt-dev@lists.freedesktop.org
Cc: louis.chauvet@bootlin.com, "José Expósito" <jose.exposito89@gmail.com>
Subject: [PATCH i-g-t v2 05/43] lib/vkms: Allow to enable/disable VKMS devices
Date: Thu, 13 Mar 2025 18:32:40 +0100 [thread overview]
Message-ID: <20250313173318.5818-6-jose.exposito89@gmail.com> (raw)
In-Reply-To: <20250313173318.5818-1-jose.exposito89@gmail.com>
Add helper to enable, disable and check the enabled status of a VKMS
device and add a test to ensure that the default value is correctly set.
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
---
lib/igt_vkms.c | 98 ++++++++++++++++++++++++++++++++++++++
lib/igt_vkms.h | 7 +++
tests/vkms/vkms_configfs.c | 18 +++++++
3 files changed, 123 insertions(+)
diff --git a/lib/igt_vkms.c b/lib/igt_vkms.c
index fa41f741e..1fd00afd7 100644
--- a/lib/igt_vkms.c
+++ b/lib/igt_vkms.c
@@ -7,7 +7,12 @@
#include <dirent.h>
#include <errno.h>
+#include <fcntl.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#include <ftw.h>
#include <linux/limits.h>
@@ -17,6 +22,7 @@
#include "igt_vkms.h"
#define VKMS_ROOT_DIR_NAME "vkms"
+#define VKMS_FILE_ENABLED "enabled"
/**
* SECTION:igt_vkms
@@ -47,6 +53,50 @@ static const char *mount_vkms_configfs(void)
return vkms_root_path;
}
+static int read_int(const char *path)
+{
+ FILE *file;
+ int value;
+ int ret;
+
+ file = fopen(path, "r");
+ igt_assert_f(file, "Error opening '%s'\n", path);
+
+ ret = fscanf(file, "%d", &value);
+ fclose(file);
+ igt_assert_f(ret == 1, "Error reading integer from '%s'\n", path);
+
+ return value;
+}
+
+static bool read_bool(const char *path)
+{
+ int ret;
+
+ ret = read_int(path);
+
+ return !!ret;
+}
+
+static void write_int(const char *path, int value)
+{
+ FILE *file;
+ int ret;
+
+ file = fopen(path, "w");
+ igt_assert_f(file, "Error opening '%s'\n", path);
+
+ ret = fprintf(file, "%d", value);
+ igt_assert_f(ret >= 0, "Error writing to '%s'\n", path);
+
+ fclose(file);
+}
+
+static void write_bool(const char *path, bool value)
+{
+ write_int(path, value ? 1 : 0);
+}
+
/**
* igt_require_vkms_configfs:
*
@@ -65,6 +115,22 @@ void igt_require_vkms_configfs(void)
closedir(dir);
}
+/**
+ * igt_vkms_get_device_enabled_path:
+ * @dev: Device to get the enabled path from
+ * @path: Output path
+ * @len: Maximum @path length
+ *
+ * Returns the device "enabled" file path.
+ */
+void igt_vkms_get_device_enabled_path(igt_vkms_t *dev, char *path, size_t len)
+{
+ int ret;
+
+ ret = snprintf(path, len, "%s/%s", dev->path, VKMS_FILE_ENABLED);
+ igt_assert(ret >= 0 && ret < len);
+}
+
/**
* igt_vkms_device_create:
* @name: VKMS device name
@@ -167,6 +233,8 @@ void igt_vkms_device_destroy(igt_vkms_t *dev)
igt_assert(dev);
+ igt_vkms_device_set_enabled(dev, false);
+
ret = remove_device_dir(dev);
igt_assert_f(ret == 0,
"Unable to rmdir device directory '%s'. Got errno=%d (%s)\n",
@@ -205,3 +273,33 @@ void igt_vkms_destroy_all_devices(void)
closedir(dir);
}
+
+/**
+ * igt_vkms_device_is_enabled:
+ * @dev: The device to check
+ *
+ * Indicate whether a VKMS device is enabled or not.
+ */
+bool igt_vkms_device_is_enabled(igt_vkms_t *dev)
+{
+ char path[PATH_MAX];
+
+ igt_vkms_get_device_enabled_path(dev, path, sizeof(path));
+
+ return read_bool(path);
+}
+
+/**
+ * igt_vkms_device_set_enabled:
+ * @dev: Device to enable or disable
+ *
+ * Enable or disable a VKMS device.
+ */
+void igt_vkms_device_set_enabled(igt_vkms_t *dev, bool enabled)
+{
+ char path[PATH_MAX];
+
+ igt_vkms_get_device_enabled_path(dev, path, sizeof(path));
+
+ write_bool(path, enabled);
+}
diff --git a/lib/igt_vkms.h b/lib/igt_vkms.h
index 48c48f296..d3741b6ee 100644
--- a/lib/igt_vkms.h
+++ b/lib/igt_vkms.h
@@ -8,6 +8,8 @@
#ifndef __IGT_VKMS_H__
#define __IGT_VKMS_H__
+#include <stdbool.h>
+
/**
* igt_vkms_t:
* @path: VKMS root directory inside configfs mounted directory
@@ -20,8 +22,13 @@ typedef struct igt_vkms {
void igt_require_vkms_configfs(void);
+void igt_vkms_get_device_enabled_path(igt_vkms_t *dev, char *path, size_t len);
+
igt_vkms_t *igt_vkms_device_create(const char *name);
void igt_vkms_device_destroy(igt_vkms_t *dev);
void igt_vkms_destroy_all_devices(void);
+bool igt_vkms_device_is_enabled(igt_vkms_t *dev);
+void igt_vkms_device_set_enabled(igt_vkms_t *dev, bool enabled);
+
#endif /* __IGT_VKMS_H__ */
diff --git a/tests/vkms/vkms_configfs.c b/tests/vkms/vkms_configfs.c
index b942cec64..aa7cd9e4e 100644
--- a/tests/vkms/vkms_configfs.c
+++ b/tests/vkms/vkms_configfs.c
@@ -103,6 +103,23 @@ static void test_device_default_files(void)
igt_vkms_device_destroy(dev);
}
+/**
+ * SUBTEST: device-default-values
+ * Description: Check that the default values for the device are correct.
+ */
+
+static void test_device_default_values(void)
+{
+ igt_vkms_t *dev;
+
+ dev = igt_vkms_device_create(__func__);
+ igt_assert(dev);
+
+ igt_assert(!igt_vkms_device_is_enabled(dev));
+
+ igt_vkms_device_destroy(dev);
+}
+
igt_main
{
struct {
@@ -110,6 +127,7 @@ igt_main
void (*fn)(void);
} tests[] = {
{ "device-default-files", test_device_default_files },
+ { "device-default-values", test_device_default_values },
};
igt_fixture {
--
2.48.1
next prev parent reply other threads:[~2025-03-13 17:33 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-13 17:32 [PATCH i-g-t v2 00/43] VKMS configfs tests José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 01/43] lib/drmtest: Add VKMS as a known driver type José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 02/43] lib/igt_debugfs: Move is_mountpoint() to igt_aux José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 03/43] lib/igt_configfs: Add helper to mount configfs José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 04/43] lib/vkms: Add minimal VKMS library and test device default files José Expósito
2025-03-13 17:32 ` José Expósito [this message]
2025-03-13 17:32 ` [PATCH i-g-t v2 06/43] tests/vkms_configfs: Test device invalid values José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 07/43] lib/vkms: Test plane default files José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 08/43] lib/vkms: Test plane default values José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 09/43] lib/vkms: Test plane invalid values José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 10/43] tests/vkms_configfs: Test plane valid values José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 11/43] lib/vkms: Test CRTC default files José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 12/43] lib/vkms: Test CRTC default values José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 13/43] lib/vkms: Test CRTC invalid values José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 14/43] tests/vkms_configfs: Test CRTC valid values José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 15/43] lib/vkms: Test encoder default files José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 16/43] lib/vkms: Test connector " José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 17/43] lib/vkms: Test connector default values José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 18/43] lib/vkms: Test connector invalid values José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 19/43] tests/vkms_configfs: Test connector valid values José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 20/43] lib/vkms: Test attaching planes to CRTCs José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 21/43] lib/vkms: Test attaching encoders " José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 22/43] lib/vkms: Test attaching connectors to encoders José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 23/43] lib/igt_device_scan: Allow to find device by sysname José Expósito
2025-06-11 11:09 ` Kamil Konieczny
2025-07-15 10:27 ` José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 24/43] tests/vkms_configfs: Test enablement without pipeline items José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 25/43] lib/vkms: Create VKMS device from static config José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 26/43] tests/vkms_configfs: Test adding too many planes José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 27/43] tests/vkms_configfs: Test not adding a primary plane José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 28/43] tests/vkms_configfs: Test adding multiple primary planes José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 29/43] tests/vkms_configfs: Test adding multiple cursor planes José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 30/43] tests/vkms_configfs: Test adding a plane without possible CRTCs José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 31/43] tests/vkms_configfs: Test enabling a device without CRTCs José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 32/43] tests/vkms_configfs: Test enabling a device with too many CRTCs José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 33/43] tests/vkms_configfs: Test enabling a device without encoders José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 34/43] tests/vkms_configfs: Test enabling a device with too many encoders José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 35/43] tests/vkms_configfs: Test adding an encoder without possible CRTCs José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 36/43] tests/vkms_configfs: Test adding a CRTC without encoders José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 37/43] tests/vkms_configfs: Test enabling a device without connectors José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 38/43] tests/vkms_configfs: Test enabling a device with too many connectors José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 39/43] lib/vkms: Test changing enabled device planes José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 40/43] lib/vkms: Test changing enabled device CRTCs José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 41/43] lib/vkms: Test changing enabled device encoders José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 42/43] lib/vkms: Test changing enabled device connectors José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 43/43] tests/vkms_configfs: Test connector hot-plug José Expósito
2025-03-14 16:54 ` ✗ Xe.CI.Full: failure for VKMS configfs tests (rev4) Patchwork
2025-03-15 0:05 ` ✓ Xe.CI.BAT: success for VKMS configfs tests (rev5) Patchwork
2025-03-15 0:30 ` ✓ i915.CI.BAT: " Patchwork
2025-03-15 9:06 ` ✗ Xe.CI.Full: failure " Patchwork
2025-03-15 11:32 ` ✗ i915.CI.Full: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250313173318.5818-6-jose.exposito89@gmail.com \
--to=jose.exposito89@gmail.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=louis.chauvet@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox