From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 752F1C19F2E for ; Thu, 27 Feb 2025 14:30:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1544610EAF7; Thu, 27 Feb 2025 14:30:38 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=bootlin.com header.i=@bootlin.com header.b="OSvH1oXJ"; dkim-atps=neutral Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by gabe.freedesktop.org (Postfix) with ESMTPS id 45E9D10EB10 for ; Thu, 27 Feb 2025 14:30:32 +0000 (UTC) Received: by mail.gandi.net (Postfix) with ESMTPSA id 45F2D4426F; Thu, 27 Feb 2025 14:30:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1740666629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=vqBET5VbZIJLsoBKlHZeg+kxjvgO0vNhzCOYkmioloo=; b=OSvH1oXJ/E8K1SXdZbKw7EL4oSks9oBgz2IUi+ig8FvYs8g/BNjdYTKCXAWpzPfB6+xaVd x2yWSQXW4IcXx01W49RAY9Ou6T6up7EuHUvBm1NKHHjPUA8JtKjTaHCTb/ApM2GrhDt4Ga +zV46X4JaujBZxq6ZZmTe4/smklVKsvXn15CVk29ht1W+G+2PUxH6BlgPlq/Ae2SqwKYH9 MBGefSHZfQpl5/K1khg5lSJhj8/h4/G+Kbk7y8oFkbVSZQrTlliHpVxBHm4OwhnbyX6M/c s3FFJODXdfBtrculwZ4/ZCXsjq+QwNgiZiMRyFHY5imHVN1er5d0iikEdDCybw== Message-ID: Date: Thu, 27 Feb 2025 15:30:28 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH i-g-t 21/39] lib/vkms: Create VKMS device from static config To: =?UTF-8?B?Sm9zw6kgRXhww7NzaXRv?= , igt-dev@lists.freedesktop.org References: <20250218165011.9123-1-jose.exposito89@gmail.com> <20250218165011.9123-22-jose.exposito89@gmail.com> Content-Language: en-US From: Louis Chauvet Autocrypt: addr=louis.chauvet@bootlin.com; keydata= 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 In-Reply-To: <20250218165011.9123-22-jose.exposito89@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-GND-State: clean X-GND-Score: -100 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdekjeejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfitefpfffkpdcuggftfghnshhusghstghrihgsvgenuceurghilhhouhhtmecufedtudenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhepkfffgggfuffvfhfhjggtgfesthekredttddvjeenucfhrhhomhepnfhouhhishcuvehhrghuvhgvthcuoehlohhuihhsrdgthhgruhhvvghtsegsohhothhlihhnrdgtohhmqeenucggtffrrghtthgvrhhnpeeuvdetgeevkefhiedugfekveejieeiveeigeeiveduffehfffhgeffffetheekgfenucffohhmrghinhepsghoohhtlhhinhdrtghomhenucfkphepledtrdekledrudeifedruddvjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeeltddrkeelrdduieefrdduvdejpdhhvghloheplgduledvrdduieekrddtrddvtdgnpdhmrghilhhfrhhomheplhhouhhishdrtghhrghuvhgvthessghoohhtlhhinhdrtghomhdpnhgspghrtghpthhtohepvddprhgtphhtthhopehjohhsvgdrvgigphhoshhithhokeelsehgmhgrihhlrdgtohhmpdhrtghpthhtohepihhgthdquggvvheslhhishhtshdrfhhrvggvuggvshhkthhophdrohhrgh X-GND-Sasl: louis.chauvet@bootlin.com X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" Le 18/02/2025 à 17:49, José Expósito a écrit : > In order to make the process of creating new VKMS devices as simple as > possible and in a declarative way, create a set of structures > representing a VKMS device configuration and a function that reads them > and applies the configuration. > > In addition, add a test using this new function that checks that > creating a device without planes fails. > > Signed-off-by: José Expósito > --- > lib/igt_vkms.c | 88 ++++++++++++++++++++++++++++++++++++++ > lib/igt_vkms.h | 43 +++++++++++++++++++ > tests/vkms/vkms_configfs.c | 40 +++++++++++++++++ > 3 files changed, 171 insertions(+) > > diff --git a/lib/igt_vkms.c b/lib/igt_vkms.c > index 1fcb93c94..4c44efec9 100644 > --- a/lib/igt_vkms.c > +++ b/lib/igt_vkms.c > @@ -253,6 +253,94 @@ igt_vkms_t *igt_vkms_device_create(const char *name) > return dev; > } > > +/** > + * igt_vkms_device_create_from_config: > + * @cfg: Device configuration > + * > + * Create a VKMS device and set all the parameters specified by the > + * configuration. > + */ > +igt_vkms_t *igt_vkms_device_create_from_config(igt_vkms_config_t *cfg) > +{ > + igt_vkms_t *dev; > + igt_vkms_plane_config_t *plane; > + igt_vkms_crtc_config_t *crtc; > + igt_vkms_encoder_config_t *encoder; > + igt_vkms_connector_config_t *connector; > + const char *name; > + int n, i; > + > + igt_debug("Creating device from configuration:\n"); > + igt_debug("\t- Device name: %s\n", cfg->device_name); > + > + dev = igt_vkms_device_create(cfg->device_name); > + if (!dev) > + return NULL; > + > + for (n = 0; (crtc = &cfg->crtcs[n])->name; n++) { > + igt_debug("\t- CRTC %d:\n", n); > + igt_debug("\t\t- name: %s\n", crtc->name); > + igt_debug("\t\t- writeback: %d\n", crtc->writeback); > + > + igt_vkms_device_add_crtc(dev, crtc->name); > + igt_vkms_crtc_set_writeback_enabled(dev, crtc->name, > + crtc->writeback); > + } > + > + for (n = 0; (plane = &cfg->planes[n])->name; n++) { > + igt_debug("\t- Plane %d:\n", n); > + igt_debug("\t\t- name: %s\n", plane->name); > + igt_debug("\t\t- type: %d\n", plane->type); > + igt_debug("\t\t- possible_crtcs:\n"); > + > + igt_vkms_device_add_plane(dev, plane->name); > + igt_vkms_plane_set_type(dev, plane->name, plane->type); > + > + for (i = 0; (name = plane->possible_crtcs[i]); i++) { > + igt_debug("\t\t\t- %s\n", name); > + > + igt_vkms_plane_attach_crtc(dev, plane->name, name); > + } > + } > + > + for (n = 0; (encoder = &cfg->encoders[n])->name; n++) { > + igt_debug("\t- Encoder %d:\n", n); > + igt_debug("\t\t- name: %s\n", encoder->name); > + igt_debug("\t\t- possible_crtcs:\n"); > + > + igt_vkms_device_add_encoder(dev, encoder->name); > + > + for (i = 0; (name = encoder->possible_crtcs[i]); i++) { > + igt_debug("\t\t\t- %s\n", name); > + > + igt_vkms_encoder_attach_crtc(dev, encoder->name, name); > + } > + } > + > + for (n = 0; (connector = &cfg->connectors[n])->name; n++) { > + if (connector->status == 0) > + connector->status = DRM_MODE_CONNECTED; > + > + igt_debug("\t- Connector %d:\n", n); > + igt_debug("\t\t- name: %s\n", connector->name); > + igt_debug("\t\t- status: %d\n", connector->status); > + igt_debug("\t\t- possible_encoders:\n"); > + > + igt_vkms_device_add_connector(dev, connector->name); > + igt_vkms_connector_set_status(dev, connector->name, > + connector->status); > + > + for (i = 0; (name = connector->possible_encoders[i]); i++) { > + igt_debug("\t\t\t- %s\n", name); > + > + igt_vkms_connector_attach_encoder(dev, connector->name, > + name); > + } > + } > + > + return dev; > +} > + > static int detach_pipeline_items(const char *path, const struct stat *info, > const int typeflag, struct FTW *pathinfo) > { > diff --git a/lib/igt_vkms.h b/lib/igt_vkms.h > index 1ef62125f..79edabe81 100644 > --- a/lib/igt_vkms.h > +++ b/lib/igt_vkms.h > @@ -10,6 +10,8 @@ > > #include > > +#define VKMS_MAX_PIPELINE_ITEMS 40 > + > /** > * igt_vkms_t: > * @path: VKMS root directory inside configfs mounted directory > @@ -20,9 +22,50 @@ typedef struct igt_vkms { > char *path; > } igt_vkms_t; > > +typedef struct igt_vkms_crtc_config { > + const char *name; > + bool writeback; /* Default: false */ > +} igt_vkms_crtc_config_t; > + > +typedef struct igt_vkms_plane_config { > + const char *name; > + int type; /* Default: DRM_PLANE_TYPE_OVERLAY */ > + const char *possible_crtcs[VKMS_MAX_PIPELINE_ITEMS]; > +} igt_vkms_plane_config_t; > + > +typedef struct igt_vkms_encoder_config { > + const char *name; > + const char *possible_crtcs[VKMS_MAX_PIPELINE_ITEMS]; > +} igt_vkms_encoder_config_t; > + > +typedef struct igt_vkms_connector_config { > + const char *name; > + int status; /* Default: DRM_MODE_CONNECTED */ > + const char *possible_encoders[VKMS_MAX_PIPELINE_ITEMS]; > +} igt_vkms_connector_config_t; > + > +/** > + * igt_vkms_config_t: > + * @device_name: Device name > + * @planes: NULL terminated list of plane configurations > + * @crtcs: NULL terminated list of CRTC configurations > + * @encoders: NULL terminated list of encoders configurations > + * @connectors: NULL terminated list of connector configurations > + * > + * Structure used to create a VKMS device from a static configuration. > + */ > +typedef struct igt_vkms_config { > + const char *device_name; > + igt_vkms_plane_config_t planes[VKMS_MAX_PIPELINE_ITEMS]; > + igt_vkms_crtc_config_t crtcs[VKMS_MAX_PIPELINE_ITEMS]; > + igt_vkms_encoder_config_t encoders[VKMS_MAX_PIPELINE_ITEMS]; > + igt_vkms_connector_config_t connectors[VKMS_MAX_PIPELINE_ITEMS]; > +} igt_vkms_config_t; > + > void igt_require_vkms_configfs(void); > > igt_vkms_t *igt_vkms_device_create(const char *name); > +igt_vkms_t *igt_vkms_device_create_from_config(igt_vkms_config_t *cfg); > void igt_vkms_device_destroy(igt_vkms_t *dev); > void igt_vkms_destroy_all_devices(void); > > diff --git a/tests/vkms/vkms_configfs.c b/tests/vkms/vkms_configfs.c > index 87d660fff..47cfa475f 100644 > --- a/tests/vkms/vkms_configfs.c > +++ b/tests/vkms/vkms_configfs.c > @@ -748,6 +748,45 @@ static void test_enable_no_pipeline_items(void) > igt_vkms_device_destroy(dev); > } > > +/** > + * SUBTEST: enable-no-planes > + * Description: Try to enable a VKMS device without adding planes and test that > + * it fails. > + */ > + > +static void test_enable_no_planes(void) > +{ > + igt_vkms_t *dev; > + > + igt_vkms_config_t cfg = { > + .device_name = __func__, > + .planes = { {} }, > + .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); I just though about it, maybe it could be nice to have a /my-vkms/config-valid, that returns the status of the current configuration. No need to add it to your current vkms-configfs series, I can do it later. Reviewed-by: Louis Chauvet > + igt_assert(!igt_vkms_device_is_enabled(dev)); > + igt_assert(!device_exists(__func__)); > + > + igt_vkms_device_destroy(dev); > +} > + > igt_main > { > struct { > @@ -771,6 +810,7 @@ igt_main > { "attach-encoder-to-crtc", test_attach_encoder_to_crtc }, > { "attach-connector-to-encoder", test_attach_connector_to_encoder }, > { "enable-no-pipeline-items", test_enable_no_pipeline_items }, > + { "enable-no-planes", test_enable_no_planes }, > }; > > igt_fixture { -- Louis Chauvet, Bootlin Embedded Linux and Kernel engineering https://bootlin.com