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 39/43] lib/vkms: Test changing enabled device planes
Date: Thu, 13 Mar 2025 18:33:14 +0100 [thread overview]
Message-ID: <20250313173318.5818-40-jose.exposito89@gmail.com> (raw)
In-Reply-To: <20250313173318.5818-1-jose.exposito89@gmail.com>
Test that, once a VKMS device is enabled, the plane values can't change
and that deleting it or the attached CRTCs doesn't change the VKMS
device.
Add a function that performs a basic validation checking that the
device created matches the expected one.
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
---
lib/igt_vkms.c | 24 +++++++
lib/igt_vkms.h | 1 +
tests/vkms/vkms_configfs.c | 143 +++++++++++++++++++++++++++++++++++++
3 files changed, 168 insertions(+)
diff --git a/lib/igt_vkms.c b/lib/igt_vkms.c
index ccc6910c4..96f13d628 100644
--- a/lib/igt_vkms.c
+++ b/lib/igt_vkms.c
@@ -194,6 +194,18 @@ static void get_attach_dir_path(igt_vkms_t *dev, enum vkms_pipeline_item item,
igt_assert(ret >= 0 && ret < len);
}
+static bool remove_pipeline_item(igt_vkms_t *dev, enum vkms_pipeline_item item,
+ const char *name)
+{
+ char path[PATH_MAX];
+ int ret;
+
+ get_pipeline_item_path(dev, item, name, path, sizeof(path));
+
+ ret = rmdir(path);
+ return ret == 0;
+}
+
static bool attach_pipeline_item(igt_vkms_t *dev,
enum vkms_pipeline_item src_item,
const char *src_item_name,
@@ -699,6 +711,18 @@ void igt_vkms_device_add_plane(igt_vkms_t *dev, const char *name)
add_pipeline_item(dev, VKMS_PIPELINE_ITEM_PLANE, name);
}
+/**
+ * igt_vkms_device_remove_plane:
+ * @dev: Device to remove the plane from
+ * @name: Plane name
+ *
+ * Remove an existing plane from the VKMS device.
+ */
+bool igt_vkms_device_remove_plane(igt_vkms_t *dev, const char *name)
+{
+ return remove_pipeline_item(dev, VKMS_PIPELINE_ITEM_PLANE, name);
+}
+
/**
* igt_vkms_plane_get_type:
* @dev: Device the plane belongs to
diff --git a/lib/igt_vkms.h b/lib/igt_vkms.h
index 1e077caa8..786db224e 100644
--- a/lib/igt_vkms.h
+++ b/lib/igt_vkms.h
@@ -96,6 +96,7 @@ bool igt_vkms_device_is_enabled(igt_vkms_t *dev);
void igt_vkms_device_set_enabled(igt_vkms_t *dev, bool enabled);
void igt_vkms_device_add_plane(igt_vkms_t *dev, const char *name);
+bool igt_vkms_device_remove_plane(igt_vkms_t *dev, const char *name);
int igt_vkms_plane_get_type(igt_vkms_t *dev, const char *name);
void igt_vkms_plane_set_type(igt_vkms_t *dev, const char *name, int type);
bool igt_vkms_plane_attach_crtc(igt_vkms_t *dev, const char *plane_name,
diff --git a/tests/vkms/vkms_configfs.c b/tests/vkms/vkms_configfs.c
index ad5d72481..11dea86ed 100644
--- a/tests/vkms/vkms_configfs.c
+++ b/tests/vkms/vkms_configfs.c
@@ -132,6 +132,85 @@ static bool device_exists(const char *name)
return find_device(name, &card);
}
+static void assert_device_config(igt_vkms_config_t *cfg)
+{
+ struct igt_device_card card;
+ drmModeResPtr res;
+ drmModePlaneResPtr plane_res;
+ drmModeConnectorPtr connector_res;
+ igt_vkms_crtc_config_t *crtc;
+ igt_vkms_connector_config_t *connector;
+ bool found;
+ int n_planes = 0;
+ int n_crtcs = 0;
+ int n_encoders = 0;
+ int n_connectors = 0;
+ int n_connector_status_cfg[4] = {0};
+ int n_connector_status_drm[4] = {0};
+ int fd;
+
+ found = find_device(cfg->device_name, &card);
+ igt_assert_f(found, "Device '%s' not found\n", cfg->device_name);
+
+ fd = igt_open_card(&card);
+ igt_assert_f(fd >= 0, "Error opening device '%s' at path '%s'\n",
+ cfg->device_name, card.card);
+ igt_assert_f(!drmSetClientCap(fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1),
+ "Error setting DRM_CLIENT_CAP_UNIVERSAL_PLANES\n");
+ igt_assert_f(!drmSetClientCap(fd, DRM_CLIENT_CAP_ATOMIC, 1),
+ "Error setting DRM_CLIENT_CAP_ATOMIC\n");
+ igt_assert_f(!drmSetClientCap(fd, DRM_CLIENT_CAP_WRITEBACK_CONNECTORS, 1),
+ "Error setting DRM_CLIENT_CAP_WRITEBACK_CONNECTORS\n");
+
+ res = drmModeGetResources(fd);
+ igt_assert_f(res, "Error getting resources\n");
+ plane_res = drmModeGetPlaneResources(fd);
+ igt_assert_f(plane_res, "Error getting plane resources\n");
+
+ for (int n = 0; (&cfg->planes[n])->name; n++)
+ n_planes++;
+
+ for (int n = 0; (crtc = &cfg->crtcs[n])->name; n++) {
+ n_crtcs++;
+
+ if (crtc->writeback) {
+ n_encoders++;
+ n_connectors++;
+ n_connector_status_cfg[DRM_MODE_UNKNOWNCONNECTION]++;
+ }
+ }
+
+ for (int n = 0; (&cfg->encoders[n])->name; n++)
+ n_encoders++;
+
+ for (int n = 0; (connector = &cfg->connectors[n])->name; n++) {
+ n_connectors++;
+ n_connector_status_cfg[connector->status]++;
+ }
+
+ for (int n = 0; n < res->count_connectors; n++) {
+ connector_res = drmModeGetConnectorCurrent(fd,
+ res->connectors[n]);
+ n_connector_status_drm[connector_res->connection]++;
+ drmModeFreeConnector(connector_res);
+ }
+
+ igt_assert_eq(n_planes, plane_res->count_planes);
+ igt_assert_eq(n_crtcs, res->count_crtcs);
+ igt_assert_eq(n_encoders, res->count_encoders);
+ igt_assert_eq(n_connectors, res->count_connectors);
+ igt_assert_eq(n_connector_status_cfg[DRM_MODE_CONNECTED],
+ n_connector_status_drm[DRM_MODE_CONNECTED]);
+ igt_assert_eq(n_connector_status_cfg[DRM_MODE_DISCONNECTED],
+ n_connector_status_drm[DRM_MODE_DISCONNECTED]);
+ igt_assert_eq(n_connector_status_cfg[DRM_MODE_UNKNOWNCONNECTION],
+ n_connector_status_drm[DRM_MODE_UNKNOWNCONNECTION]);
+
+ drmModeFreePlaneResources(plane_res);
+ drmModeFreeResources(res);
+ close(fd);
+}
+
/**
* SUBTEST: device-default-files
* Description: Test that creating a VKMS device creates the default files and
@@ -1493,6 +1572,69 @@ static void test_enable_too_many_connectors(void)
igt_vkms_device_destroy(dev);
}
+/**
+ * SUBTEST: enabled-plane-cannot-change
+ * Description: Test that, once a VKMS device is enabled, the plane values can't
+ * change and that deleting it or the attached CRTCs doesn't change
+ * the VKMS device.
+ */
+
+static void test_enabled_plane_cannot_change(void)
+{
+ igt_vkms_t *dev;
+
+ igt_vkms_config_t cfg = {
+ .device_name = __func__,
+ .planes = {
+ {
+ .name = "plane0",
+ .type = DRM_PLANE_TYPE_PRIMARY,
+ .possible_crtcs = { "crtc0"},
+ },
+ {
+ .name = "plane1",
+ .type = DRM_PLANE_TYPE_PRIMARY,
+ .possible_crtcs = { "crtc1"},
+ },
+ },
+ .crtcs = {
+ { .name = "crtc0" },
+ { .name = "crtc1" },
+ },
+ .encoders = {
+ { .name = "encoder0", .possible_crtcs = { "crtc0" } },
+ { .name = "encoder1", .possible_crtcs = { "crtc1" } },
+ },
+ .connectors = {
+ {
+ .name = "connector0",
+ .possible_encoders = { "encoder0", "encoder1" },
+ },
+ },
+ };
+
+ dev = igt_vkms_device_create_from_config(&cfg);
+ igt_assert(dev);
+
+ igt_vkms_device_set_enabled(dev, true);
+ igt_assert(igt_vkms_device_is_enabled(dev));
+ assert_device_config(&cfg);
+
+ /* Try to change values */
+ igt_vkms_plane_set_type(dev, "plane0", DRM_PLANE_TYPE_OVERLAY);
+ igt_assert_eq(igt_vkms_plane_get_type(dev, "plane0"),
+ DRM_PLANE_TYPE_PRIMARY);
+
+ igt_assert(!igt_vkms_plane_attach_crtc(dev, "plane0", "crtc1"));
+
+ /* Deleting pipeline items doesn't affect the device */
+ igt_assert(igt_vkms_plane_detach_crtc(dev, "plane0", "crtc0"));
+ igt_assert(igt_vkms_device_remove_plane(dev, "plane0"));
+ assert_device_config(&cfg);
+
+ igt_vkms_device_destroy(dev);
+}
+
igt_main
{
struct {
@@ -1533,6 +1675,7 @@ igt_main
{ "enable-crtc-no-encoder", test_enable_crtc_no_encoder },
{ "enable-no-connectors", test_enable_no_connectors },
{ "enable-too-many-connectors", test_enable_too_many_connectors },
+ { "enabled-plane-cannot-change", test_enabled_plane_cannot_change },
};
igt_fixture {
--
2.48.1
next prev parent reply other threads:[~2025-03-13 17:34 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 ` [PATCH i-g-t v2 05/43] lib/vkms: Allow to enable/disable VKMS devices José Expósito
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 ` José Expósito [this message]
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-40-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