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 05/39] lib/vkms: Allow to enable/disable VKMS devices
Date: Tue, 18 Feb 2025 17:49:37 +0100 [thread overview]
Message-ID: <20250218165011.9123-6-jose.exposito89@gmail.com> (raw)
In-Reply-To: <20250218165011.9123-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 | 80 ++++++++++++++++++++++++++++++++++++++
lib/igt_vkms.h | 5 +++
tests/vkms/vkms_configfs.c | 18 +++++++++
3 files changed, 103 insertions(+)
diff --git a/lib/igt_vkms.c b/lib/igt_vkms.c
index 8cea94901..1fdfb09f7 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
@@ -45,6 +51,48 @@ 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;
+
+ file = fopen(path, "w");
+ igt_assert_f(file, "Error opening '%s'\n", path);
+
+ fprintf(file, "%d", value);
+
+ fclose(file);
+}
+
+static void write_bool(const char *path, bool value)
+{
+ write_int(path, value ? 1 : 0);
+}
+
/**
* igt_require_vkms_configfs:
*
@@ -151,6 +199,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",
@@ -189,3 +239,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];
+
+ snprintf(path, sizeof(path), "%s/%s", dev->path, VKMS_FILE_ENABLED);
+
+ 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];
+
+ snprintf(path, sizeof(path), "%s/%s", dev->path, VKMS_FILE_ENABLED);
+
+ write_bool(path, enabled);
+}
diff --git a/lib/igt_vkms.h b/lib/igt_vkms.h
index 48c48f296..dab51852a 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
@@ -24,4 +26,7 @@ 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 441c39a47..6c7d0310c 100644
--- a/tests/vkms/vkms_configfs.c
+++ b/tests/vkms/vkms_configfs.c
@@ -94,6 +94,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 {
@@ -101,6 +118,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-02-19 9:31 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-18 16:49 [PATCH i-g-t 00/39] VKMS configfs tests José Expósito
2025-02-18 16:49 ` [PATCH i-g-t 01/39] lib/drmtest: Add VKMS as a known driver type José Expósito
2025-02-27 13:12 ` Louis Chauvet
2025-03-13 17:22 ` José Expósito
2025-02-18 16:49 ` [PATCH i-g-t 02/39] lib/igt_debugfs: Move is_mountpoint() to igt_aux José Expósito
2025-02-27 13:12 ` Louis Chauvet
2025-02-18 16:49 ` [PATCH i-g-t 03/39] lib/igt_configfs: Add helper to mount configfs José Expósito
2025-02-27 13:14 ` Louis Chauvet
2025-02-18 16:49 ` [PATCH i-g-t 04/39] lib/vkms: Add minimal VKMS library and test device default files José Expósito
2025-02-27 13:12 ` Louis Chauvet
2025-02-18 16:49 ` José Expósito [this message]
2025-02-27 13:15 ` [PATCH i-g-t 05/39] lib/vkms: Allow to enable/disable VKMS devices Louis Chauvet
2025-02-18 16:49 ` [PATCH i-g-t 06/39] tests/vkms_configfs: Test device invalid values José Expósito
2025-02-27 13:14 ` Louis Chauvet
2025-02-18 16:49 ` [PATCH i-g-t 07/39] lib/vkms: Test plane default files José Expósito
2025-02-27 13:15 ` Louis Chauvet
2025-02-18 16:49 ` [PATCH i-g-t 08/39] lib/vkms: Test plane default values José Expósito
2025-02-27 13:15 ` Louis Chauvet
2025-02-18 16:49 ` [PATCH i-g-t 09/39] lib/vkms: Test plane invalid values José Expósito
2025-02-27 13:14 ` Louis Chauvet
2025-02-18 16:49 ` [PATCH i-g-t 10/39] lib/vkms: Test CRTC default files José Expósito
2025-02-27 13:15 ` Louis Chauvet
2025-02-18 16:49 ` [PATCH i-g-t 11/39] lib/vkms: Test CRTC default values José Expósito
2025-02-27 13:12 ` Louis Chauvet
2025-02-18 16:49 ` [PATCH i-g-t 12/39] lib/vkms: Test CRTC invalid values José Expósito
2025-02-27 13:12 ` Louis Chauvet
2025-02-18 16:49 ` [PATCH i-g-t 13/39] lib/vkms: Test encoder default files José Expósito
2025-02-27 13:14 ` Louis Chauvet
2025-03-13 17:25 ` José Expósito
2025-02-18 16:49 ` [PATCH i-g-t 14/39] lib/vkms: Test connector " José Expósito
2025-02-18 16:49 ` [PATCH i-g-t 15/39] lib/vkms: Test connector default values José Expósito
2025-02-18 16:49 ` [PATCH i-g-t 16/39] lib/vkms: Test plane connector invalid values José Expósito
2025-02-27 13:12 ` Louis Chauvet
2025-02-18 16:49 ` [PATCH i-g-t 17/39] lib/vkms: Test attaching planes to CRTCs José Expósito
2025-02-27 13:15 ` Louis Chauvet
2025-03-13 17:23 ` José Expósito
2025-02-18 16:49 ` [PATCH i-g-t 18/39] lib/vkms: Test attaching encoders " José Expósito
2025-02-18 16:49 ` [PATCH i-g-t 19/39] lib/vkms: Test attaching connectors to encoders José Expósito
2025-02-18 16:49 ` [PATCH i-g-t 20/39] tests/vkms_configfs: Test enablement without pipeline items José Expósito
2025-02-27 13:06 ` Louis Chauvet
2025-02-28 1:47 ` Greg Kroah-Hartman
2025-02-28 11:58 ` José Expósito
2025-02-18 16:49 ` [PATCH i-g-t 21/39] lib/vkms: Create VKMS device from static config José Expósito
2025-02-27 14:30 ` Louis Chauvet
2025-02-18 16:49 ` [PATCH i-g-t 22/39] tests/vkms_configfs: Test adding too many planes José Expósito
2025-02-27 14:53 ` Louis Chauvet
2025-02-18 16:49 ` [PATCH i-g-t 23/39] tests/vkms_configfs: Test not adding a primary plane José Expósito
2025-02-27 14:54 ` Louis Chauvet
2025-02-18 16:49 ` [PATCH i-g-t 24/39] tests/vkms_configfs: Test adding multiple primary planes José Expósito
2025-02-27 15:00 ` Louis Chauvet
2025-02-18 16:49 ` [PATCH i-g-t 25/39] tests/vkms_configfs: Test adding multiple cursor planes José Expósito
2025-02-27 15:00 ` Louis Chauvet
2025-02-18 16:49 ` [PATCH i-g-t 26/39] tests/vkms_configfs: Test adding a plane without possible CRTCs José Expósito
2025-02-27 15:01 ` Louis Chauvet
2025-02-18 16:49 ` [PATCH i-g-t 27/39] tests/vkms_configfs: Test enabling a device without CRTCs José Expósito
2025-02-27 15:15 ` Louis Chauvet
2025-02-18 16:50 ` [PATCH i-g-t 28/39] tests/vkms_configfs: Test enabling a device with too many CRTCs José Expósito
2025-02-27 15:05 ` Louis Chauvet
2025-02-18 16:50 ` [PATCH i-g-t 29/39] tests/vkms_configfs: Test enabling a device without encoders José Expósito
2025-02-27 15:05 ` Louis Chauvet
2025-02-18 16:50 ` [PATCH i-g-t 30/39] tests/vkms_configfs: Test enabling a device with too many encoders José Expósito
2025-02-27 15:05 ` Louis Chauvet
2025-02-18 16:50 ` [PATCH i-g-t 31/39] tests/vkms_configfs: Test adding an encoder without possible CRTCs José Expósito
2025-02-27 15:15 ` Louis Chauvet
2025-02-18 16:50 ` [PATCH i-g-t 32/39] tests/vkms_configfs: Test adding a CRTC without encoders José Expósito
2025-02-27 15:15 ` Louis Chauvet
2025-02-18 16:50 ` [PATCH i-g-t 33/39] tests/vkms_configfs: Test enabling a device without connectors José Expósito
2025-02-27 15:15 ` Louis Chauvet
2025-02-18 16:50 ` [PATCH i-g-t 34/39] tests/vkms_configfs: Test enabling a device with too many connectors José Expósito
2025-02-27 15:15 ` Louis Chauvet
2025-02-18 16:50 ` [PATCH i-g-t 35/39] lib/vkms: Test changing enabled device planes José Expósito
2025-02-28 8:51 ` Louis Chauvet
2025-02-28 11:52 ` José Expósito
2025-02-28 22:15 ` Louis Chauvet
2025-02-18 16:50 ` [PATCH i-g-t 36/39] lib/vkms: Test changing enabled device CRTCs José Expósito
2025-02-18 16:50 ` [PATCH i-g-t 37/39] lib/vkms: Test changing enabled device encoders José Expósito
2025-02-18 16:50 ` [PATCH i-g-t 38/39] lib/vkms: Test changing enabled device connectors José Expósito
2025-02-18 16:50 ` [PATCH i-g-t 39/39] tests/vkms_configfs: Test connector hot-plug José Expósito
2025-02-28 8:51 ` Louis Chauvet
2025-02-27 13:11 ` [PATCH i-g-t 00/39] VKMS configfs tests Louis Chauvet
2025-02-28 21:22 ` ✓ Xe.CI.BAT: success for VKMS configfs tests (rev3) Patchwork
2025-02-28 21:25 ` ✓ i915.CI.BAT: " Patchwork
2025-03-01 5:04 ` ✗ Xe.CI.Full: failure " Patchwork
2025-03-01 9:43 ` ✗ 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=20250218165011.9123-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