Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
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 20/43] lib/vkms: Test attaching planes to CRTCs
Date: Thu, 13 Mar 2025 18:32:55 +0100	[thread overview]
Message-ID: <20250313173318.5818-21-jose.exposito89@gmail.com> (raw)
In-Reply-To: <20250313173318.5818-1-jose.exposito89@gmail.com>

Add helpers to attach and detach planes and CRTCs and a test checking
the different valid and invalid cases.

Signed-off-by: José Expósito <jose.exposito89@gmail.com>
---
 lib/igt_vkms.c             | 120 +++++++++++++++++++++++++++++++++++++
 lib/igt_vkms.h             |   6 ++
 tests/vkms/vkms_configfs.c |  78 ++++++++++++++++++++++++
 3 files changed, 204 insertions(+)

diff --git a/lib/igt_vkms.c b/lib/igt_vkms.c
index 1cd560038..ea18816e7 100644
--- a/lib/igt_vkms.c
+++ b/lib/igt_vkms.c
@@ -163,6 +163,81 @@ static void add_pipeline_item(igt_vkms_t *dev, enum vkms_pipeline_item item,
 		     path, errno, strerror(errno));
 }
 
+static const char *get_attach_dir_name(enum vkms_pipeline_item item)
+{
+	switch (item) {
+	case VKMS_PIPELINE_ITEM_PLANE:
+		return "possible_crtcs";
+	case VKMS_PIPELINE_ITEM_ENCODER:
+		return "possible_crtcs";
+	case VKMS_PIPELINE_ITEM_CONNECTOR:
+		return "possible_encoders";
+	default:
+		break;
+	}
+
+	igt_assert(!"Cannot be reached: Unknown VKMS attach directory name");
+}
+
+static void get_attach_dir_path(igt_vkms_t *dev, enum vkms_pipeline_item item,
+				const char *name, char *path, size_t len)
+{
+	const char *item_dir_name;
+	const char *attach_dir_name;
+	int ret;
+
+	item_dir_name = get_pipeline_item_dir_name(item);
+	attach_dir_name = get_attach_dir_name(item);
+
+	ret = snprintf(path, len, "%s/%s/%s/%s", dev->path, item_dir_name, name,
+		       attach_dir_name);
+	igt_assert(ret >= 0 && ret < len);
+}
+
+static bool attach_pipeline_item(igt_vkms_t *dev,
+				 enum vkms_pipeline_item src_item,
+				 const char *src_item_name,
+				 enum vkms_pipeline_item dst_item,
+				 const char *dst_item_name)
+{
+	char src_attach_path[PATH_MAX];
+	char src_path[PATH_MAX];
+	char dst_path[PATH_MAX];
+	int ret;
+
+	get_attach_dir_path(dev, src_item, src_item_name, src_attach_path,
+			    sizeof(src_attach_path));
+	ret = snprintf(src_path, sizeof(src_path), "%s/%s", src_attach_path,
+		       dst_item_name);
+	igt_assert(ret >= 0 && ret < sizeof(src_path));
+
+	get_pipeline_item_path(dev, dst_item, dst_item_name, dst_path,
+			       sizeof(dst_path));
+
+	ret = symlink(dst_path, src_path);
+	return ret == 0;
+}
+
+static bool detach_pipeline_item(igt_vkms_t *dev,
+				 enum vkms_pipeline_item src_item,
+				 const char *src_item_name,
+				 const char *dst_item_name)
+{
+	char attach_path[PATH_MAX];
+	char link_path[PATH_MAX];
+	int ret;
+
+	get_attach_dir_path(dev, src_item, src_item_name, attach_path,
+			    sizeof(attach_path));
+
+	ret = snprintf(link_path, sizeof(link_path), "%s/%s", attach_path,
+		       dst_item_name);
+	igt_assert(ret >= 0 && ret < sizeof(link_path));
+
+	ret = unlink(link_path);
+	return ret == 0;
+}
+
 /**
  * igt_require_vkms_configfs:
  *
@@ -228,6 +303,21 @@ void igt_vkms_get_plane_type_path(igt_vkms_t *dev, const char *name, char *path,
 				    VKMS_FILE_PLANE_TYPE, path, len);
 }
 
+/**
+ * igt_vkms_get_plane_possible_crtcs_path:
+ * @dev: Device containing the plane
+ * @name: Plane name
+ * @path: Output path
+ * @len: Maximum @path length
+ *
+ * Returns the plane "possible_crtcs" directory path.
+ */
+void igt_vkms_get_plane_possible_crtcs_path(igt_vkms_t *dev, const char *name,
+					    char *path, size_t len)
+{
+	get_attach_dir_path(dev, VKMS_PIPELINE_ITEM_PLANE, name, path, len);
+}
+
 /**
  * igt_vkms_get_crtc_path:
  * @dev: Device containing the CRTC
@@ -529,6 +619,36 @@ void igt_vkms_plane_set_type(igt_vkms_t *dev, const char *name, int type)
 	write_int(path, type);
 }
 
+/**
+ * igt_vkms_plane_attach_crtc:
+ * @dev: Target device
+ * @plane_name: Target plane name
+ * @crtc_name: Destination CRTC name
+ *
+ * Attach a plane to a CRTC. Return true on success and false on error.
+ */
+bool igt_vkms_plane_attach_crtc(igt_vkms_t *dev, const char *plane_name,
+				const char *crtc_name)
+{
+	return attach_pipeline_item(dev, VKMS_PIPELINE_ITEM_PLANE, plane_name,
+				    VKMS_PIPELINE_ITEM_CRTC, crtc_name);
+}
+
+/**
+ * igt_vkms_plane_detach_crtc:
+ * @dev: Target device
+ * @plane_name: Target plane name
+ * @crtc_name: Destination CRTC name
+ *
+ * Detach a plane from a CRTC. Return true on success and false on error.
+ */
+bool igt_vkms_plane_detach_crtc(igt_vkms_t *dev, const char *plane_name,
+				const char *crtc_name)
+{
+	return detach_pipeline_item(dev, VKMS_PIPELINE_ITEM_PLANE, plane_name,
+				    crtc_name);
+}
+
 /**
  * igt_vkms_device_add_crtc:
  * @dev: Device to add the CRTC to
diff --git a/lib/igt_vkms.h b/lib/igt_vkms.h
index df64bde9d..58896790b 100644
--- a/lib/igt_vkms.h
+++ b/lib/igt_vkms.h
@@ -27,6 +27,8 @@ void igt_vkms_get_plane_path(igt_vkms_t *dev, const char *name, char *path,
 			     size_t len);
 void igt_vkms_get_plane_type_path(igt_vkms_t *dev, const char *name, char *path,
 				  size_t len);
+void igt_vkms_get_plane_possible_crtcs_path(igt_vkms_t *dev, const char *name,
+					    char *path, size_t len);
 void igt_vkms_get_crtc_path(igt_vkms_t *dev, const char *name, char *path,
 			    size_t len);
 void igt_vkms_get_crtc_writeback_path(igt_vkms_t *dev, const char *name,
@@ -48,6 +50,10 @@ 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);
 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,
+				const char *crtc_name);
+bool igt_vkms_plane_detach_crtc(igt_vkms_t *dev, const char *plane_name,
+				const char *crtc_name);
 
 void igt_vkms_device_add_crtc(igt_vkms_t *dev, const char *name);
 bool igt_vkms_crtc_is_writeback_enabled(igt_vkms_t *dev, const char *name);
diff --git a/tests/vkms/vkms_configfs.c b/tests/vkms/vkms_configfs.c
index 407310e52..5ee03ed2f 100644
--- a/tests/vkms/vkms_configfs.c
+++ b/tests/vkms/vkms_configfs.c
@@ -103,6 +103,20 @@ static void assert_wrong_bool_values(const char *path)
 	}
 }
 
+static bool attach(const char *src_path, const char *dst_path,
+		   const char *link_name)
+{
+	char link_path[PATH_MAX];
+	int ret;
+
+	ret = snprintf(link_path, sizeof(link_path), "%s/%s", src_path, link_name);
+	igt_assert(ret >= 0 && ret < sizeof(link_path));
+
+	ret = symlink(dst_path, link_path);
+
+	return ret == 0;
+}
+
 /**
  * SUBTEST: device-default-files
  * Description: Test that creating a VKMS device creates the default files and
@@ -565,6 +579,69 @@ static void test_connector_valid_values(void)
 	igt_vkms_device_destroy(dev);
 }
 
+/**
+ * SUBTEST: attach-plane-to-crtc
+ * Description: Check that errors are handled while attaching planes to CRTCs.
+ */
+
+static void test_attach_plane_to_crtc(void)
+{
+	igt_vkms_t *dev1;
+	igt_vkms_t *dev2;
+	char plane1[PATH_MAX];
+	char crtc1[PATH_MAX];
+	char connector1[PATH_MAX];
+	char crtc2[PATH_MAX];
+	char dev2_enabled_path[PATH_MAX];
+	bool ok;
+
+	dev1 = igt_vkms_device_create("test_attach_plane_to_crtc_1");
+	igt_assert(dev1);
+
+	dev2 = igt_vkms_device_create("test_attach_plane_to_crtc_2");
+	igt_assert(dev2);
+
+	igt_vkms_device_add_plane(dev1, "plane1");
+	igt_vkms_device_add_crtc(dev1, "crtc1");
+	igt_vkms_device_add_connector(dev1, "connector1");
+	igt_vkms_device_add_crtc(dev2, "crtc2");
+
+	igt_vkms_get_plane_possible_crtcs_path(dev1, "plane1", plane1, sizeof(plane1));
+	igt_vkms_get_crtc_path(dev1, "crtc1", crtc1, sizeof(crtc1));
+	igt_vkms_get_connector_path(dev1, "connector1", connector1, sizeof(connector1));
+	igt_vkms_get_crtc_path(dev2, "crtc2", crtc2, sizeof(crtc2));
+	igt_vkms_get_device_enabled_path(dev2, dev2_enabled_path, sizeof(dev2_enabled_path));
+
+	/* Error: Attach a plane to a connector */
+	ok = attach(plane1, connector1, "connector");
+	igt_assert_f(!ok, "Attaching plane1 to connector1 should fail\n");
+
+	/* Error: Attach a plane to a random file */
+	ok = attach(plane1, dev2_enabled_path, "file");
+	igt_assert_f(!ok, "Attaching plane1 to a random file should fail\n");
+
+	/* Error: Attach a plane to a CRTC from other device */
+	ok = attach(plane1, crtc2, "crtc2");
+	igt_assert_f(!ok, "Attaching plane1 to crtc2 should fail\n");
+
+	/* OK: Attaching plane1 to crtc1 */
+	ok = igt_vkms_plane_attach_crtc(dev1, "plane1", "crtc1");
+	igt_assert_f(ok, "Error attaching plane1 to crtc1\n");
+
+	/* Error: Attaching plane1 to crtc1 twice */
+	ok = attach(plane1, crtc1, "crtc1_duplicated");
+	igt_assert_f(!ok, "Error attaching plane1 to crtc1 twice should fail");
+
+	/* OK: Detaching and attaching again */
+	ok = igt_vkms_plane_detach_crtc(dev1, "plane1", "crtc1");
+	igt_assert_f(ok, "Error detaching plane1 from crtc1\n");
+	ok = igt_vkms_plane_attach_crtc(dev1, "plane1", "crtc1");
+	igt_assert_f(ok, "Error attaching plane1 to crtc1\n");
+
+	igt_vkms_device_destroy(dev1);
+	igt_vkms_device_destroy(dev2);
+}
+
 igt_main
 {
 	struct {
@@ -587,6 +664,7 @@ igt_main
 		{ "connector-default-values", test_connector_default_values },
 		{ "connector-wrong-values", test_connector_wrong_values },
 		{ "connector-valid-values", test_connector_valid_values },
+		{ "attach-plane-to-crtc", test_attach_plane_to_crtc },
 	};
 
 	igt_fixture {
-- 
2.48.1


  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 ` [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 ` José Expósito [this message]
2025-03-13 17:32 ` [PATCH i-g-t v2 21/43] lib/vkms: Test attaching encoders to CRTCs 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-21-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