From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpout-04.galae.net (smtpout-04.galae.net [185.171.202.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B75822D63FC; Wed, 29 Oct 2025 14:37:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.171.202.116 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761748664; cv=none; b=it3p+RdCohVVardQG/IY23r0Dc05zFPF6JaL5zI0DTJ1TtoCSNTkc8ugu/ecb/NBwqaS236IIoqwQWuDQ6wH48ODLKRW1eGLkptqAo3zVTAcMcZ/iRor4HEz15Yzdi0k2eNXuGuTsmDcU6XYGpv2djm4z4/I8uv4jJv8c5bGVjs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761748664; c=relaxed/simple; bh=SxSapH92H7+R0YRpp8ZbmLEJQdfxderXgSB2dmTAdXE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=k1WIv+TAPgHpLthpkKMWHon4/mQ1NOihoiJ3lnMgIj/ay8v2OHe237/wDnar37lRAYnIQRUxuO71UnekrJpVIl0GhZczXpjX4lohe/Ee8MzosQPqoMjKTYAgGaT2oCmjEsIBZj4BI5OusVzmV7mNkDHpOwncR2cRXc9/eDwyQRk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=af/TvIDx; arc=none smtp.client-ip=185.171.202.116 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="af/TvIDx" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id 33A31C0DA85; Wed, 29 Oct 2025 14:37:21 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 8BD93606E8; Wed, 29 Oct 2025 14:37:41 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 0C255117F81BA; Wed, 29 Oct 2025 15:37:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1761748660; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=BHhX5HD+lytwOesCtdB6a6t4OMHVoG/mXwydRLC0kYA=; b=af/TvIDxpDWPVP4UP/p7j38091UYTPuy+L3Co7pxgoo8VdG3rb8V+CrzHn569B1QXJ9Vo4 mWSgc0dfWw3iAK1H2MaBvlc8UpkqV0AwMiqz+1sIhl9FtvqfkSQElRK0eJ7WmWyebyxIPN +83kBgAsGvgIj79hmIspe0lIY8qZkA+nkM+krLkO2sWihICljGQbOU5v1AibvnhDEDen2z DsPi0N5J/3DQKnL0o/bWCuJdFZYhVp4x4wWNOAzaPrJ+JBodIqVJXD0g7EuEcRXwYqf9RA qdEzE4jrbcQH6GPEb7vR6ex+XHziHNMDgui+UXFkpamLpBtP9IAN1DLdMhgURg== From: Louis Chauvet Date: Wed, 29 Oct 2025 15:37:05 +0100 Subject: [PATCH RESEND v2 28/32] drm/vkms: Store the enabled/disabled status for connector Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20251029-vkms-all-config-v2-28-a49a2d4cba26@bootlin.com> References: <20251029-vkms-all-config-v2-0-a49a2d4cba26@bootlin.com> In-Reply-To: <20251029-vkms-all-config-v2-0-a49a2d4cba26@bootlin.com> To: Haneen Mohammed , Simona Vetter , Melissa Wen , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , jose.exposito89@gmail.com, Jonathan Corbet Cc: victoria@system76.com, sebastian.wick@redhat.com, victoria@system76.com, airlied@gmail.com, thomas.petazzoni@bootlin.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Louis Chauvet X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=6498; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=SxSapH92H7+R0YRpp8ZbmLEJQdfxderXgSB2dmTAdXE=; b=owEBbQKS/ZANAwAKASCtLsZbECziAcsmYgBpAiZ90JUv9FsfWkPTdUaPaiJ9Vg6gJLdV8H7iE Irgr4DUbNmJAjMEAAEKAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCaQImfQAKCRAgrS7GWxAs 4vgkD/98Wk1tkoeqoG5YePb/qtNQl2IG77FoPeuuCjPCkC6q+tR5ZnFOua2721UvBNW9iP0GIXF BSobx8w1yOFTGK3hF7h4YiSSkHclV32eAuHHoIDO9th6zCHEoLbIEcWGfwc8WsTN/Tpc1Z1xl8d n4WbMg5qRqyp+rRH54eyQ/+dILoEGQYORABsG6/DjMz9b23TkdY4WaPkjwG0doRLQpi07NJLbHJ //04/s2scLRGMM+ohgfJt0RL5h2HdRcMHUw2D+YkKlcYyMF1VCT59mZfi6ioWyo7AmCiHW0qKQb ou/2VO5uLQs1CQatECdnP36NuROObNlYCDzWCbJQrq4hf6sI2zgqrtKwuG+UrKrRqqJEOp8thK2 Y4KRgd/5RnlbRSbuNOtLO4sW6z5/Oo7UJ1/z2gWrjaq/MmHLawCw2E1UsAdv6rhZovyhJZikoUc FnV06T+VMoVyLGVxbt8Lnt8xVgiskxmnUvnPI0qQk+KGTFETON8rcwM9cCb9yT8KoERBFmNHVyG U8DewgmJW2P1fd2DKlYlblmVDI9ZGekEFsGFAmUxSseFfdnbrrvAS73Km/DBHLPu/uEBfafG5Qt ebhNKXzhEC2bj05Y/pWeZhMm9YJfmPYRnC3sQpR3gc/7mjDsJoVleLqw/qD50FYj5uae0DIuE6V 3tbfd3dzXSFQzqw== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-Last-TLS-Session-Version: TLSv1.3 In order to prepare for dynamic connector configuration, we need to store if a connector is dynamic and if it is enabled. The two new vkms_config_connector fields will helps for that. Co-developed-by: José Expósito Signed-off-by: José Expósito Signed-off-by: Louis Chauvet --- drivers/gpu/drm/vkms/tests/vkms_config_test.c | 4 ++ drivers/gpu/drm/vkms/vkms_config.c | 6 +++ drivers/gpu/drm/vkms/vkms_config.h | 66 +++++++++++++++++++++++++++ 3 files changed, 76 insertions(+) diff --git a/drivers/gpu/drm/vkms/tests/vkms_config_test.c b/drivers/gpu/drm/vkms/tests/vkms_config_test.c index 531c3b76b58d..b1d95385263f 100644 --- a/drivers/gpu/drm/vkms/tests/vkms_config_test.c +++ b/drivers/gpu/drm/vkms/tests/vkms_config_test.c @@ -207,6 +207,10 @@ static void vkms_config_test_default_config(struct kunit *test) 0); KUNIT_EXPECT_EQ(test, vkms_config_connector_get_edid_enabled(connector_cfg), false); + KUNIT_EXPECT_EQ(test, vkms_config_connector_is_enabled(connector_cfg), + true); + KUNIT_EXPECT_EQ(test, vkms_config_connector_is_dynamic(connector_cfg), + false); } KUNIT_EXPECT_TRUE(test, vkms_config_is_valid(config)); diff --git a/drivers/gpu/drm/vkms/vkms_config.c b/drivers/gpu/drm/vkms/vkms_config.c index 02c0e944adf8..e86173ad61a6 100644 --- a/drivers/gpu/drm/vkms/vkms_config.c +++ b/drivers/gpu/drm/vkms/vkms_config.c @@ -587,6 +587,8 @@ static int vkms_config_show(struct seq_file *m, void *data) vkms_config_for_each_connector(vkmsdev->config, connector_cfg) { seq_puts(m, "connector:\n"); + seq_printf(m, "\t%s\n", + str_enabled_disabled(vkms_config_connector_is_enabled(connector_cfg))); seq_printf(m, "\tstatus=%s\n", drm_get_connector_status_name(vkms_config_connector_get_status(connector_cfg))); seq_printf(m, "\ttype=%s\n", @@ -600,6 +602,8 @@ static int vkms_config_show(struct seq_file *m, void *data) str_enabled_disabled(vkms_config_connector_get_edid_enabled(connector_cfg)), edid_len ); + seq_printf(m, "\tdynamic=%s\n", + str_true_false(vkms_config_connector_is_dynamic(connector_cfg))); } return 0; @@ -907,6 +911,8 @@ struct vkms_config_connector *vkms_config_create_connector(struct vkms_config *c connector_cfg->status = connector_status_connected; vkms_config_connector_set_type(connector_cfg, DRM_MODE_CONNECTOR_VIRTUAL); vkms_config_connector_set_supported_colorspaces(connector_cfg, 0); + vkms_config_connector_set_dynamic(connector_cfg, false); + vkms_config_connector_set_enabled(connector_cfg, true); xa_init_flags(&connector_cfg->possible_encoders, XA_FLAGS_ALLOC); list_add_tail(&connector_cfg->link, &config->connectors); diff --git a/drivers/gpu/drm/vkms/vkms_config.h b/drivers/gpu/drm/vkms/vkms_config.h index 42f5b5edaf1d..a4aa7ad7be71 100644 --- a/drivers/gpu/drm/vkms/vkms_config.h +++ b/drivers/gpu/drm/vkms/vkms_config.h @@ -130,6 +130,8 @@ struct vkms_config_encoder { * @link: Link to the others connector in vkms_config * @type: Store the type of connector using DRM_MODE_CONNECTOR_* values * @config: The vkms_config this connector belongs to + * @dynamic: Store if a connector should be created with drm_connector_dynamic_init + * @enabled: If @dynamic, this means that the correct is currently registered in drm * @status: Status (connected, disconnected...) of the connector * @supported_colorspaces: Bitmask of all the supported colorspaces. Values * are the sames as ones accepted by @@ -149,6 +151,8 @@ struct vkms_config_connector { struct vkms_config *config; int type; + bool enabled; + bool dynamic; enum drm_connector_status status; u32 supported_colorspaces; bool edid_enabled; @@ -192,6 +196,24 @@ struct vkms_config_connector { #define vkms_config_for_each_connector(config, connector_cfg) \ list_for_each_entry((connector_cfg), &(config)->connectors, link) +/** + * vkms_config_for_each_connector_static - Iterate over the static vkms_config connectors + * @config: &struct vkms_config pointer + * @connector_cfg: &struct vkms_config_connector pointer used as cursor + */ +#define vkms_config_for_each_connector_static(config, connector_cfg) \ + vkms_config_for_each_connector((config), (connector_cfg)) \ + if (!(connector_cfg)->dynamic) + +/** + * vkms_config_for_each_connector_dynamic - Iterate over the dynamic vkms_config connectors + * @config: &struct vkms_config pointer + * @connector_cfg: &struct vkms_config_connector pointer used as cursor + */ +#define vkms_config_for_each_connector_dynamic(config, connector_cfg) \ + vkms_config_for_each_connector((config), (connector_cfg)) \ + if ((connector_cfg)->dynamic) + /** * vkms_config_plane_for_each_possible_crtc - Iterate over the vkms_config_plane * possible CRTCs @@ -445,6 +467,50 @@ vkms_config_connector_set_type(struct vkms_config_connector *connector_cfg, connector_cfg->type = type; } +/** + * vkms_config_connector_set_enabled() - If the connector is part of the device + * @crtc_cfg: Target connector + * @enabled: Add or remove the connector + */ +static inline void +vkms_config_connector_set_enabled(struct vkms_config_connector *connector_cfg, + bool enabled) +{ + connector_cfg->enabled = enabled; +} + +/** + * vkms_config_connector_is_enabled() - If the connector is part of the device + * @connector_cfg: The connector + */ +static inline bool +vkms_config_connector_is_enabled(const struct vkms_config_connector *connector_cfg) +{ + return connector_cfg->enabled; +} + +/** + * vkms_config_connector_set_dynamic() - If the connector is dynamic + * @crtc_cfg: Target connector + * @enabled: Enable or disable the dynamic status + */ +static inline void +vkms_config_connector_set_dynamic(struct vkms_config_connector *connector_cfg, + bool dynamic) +{ + connector_cfg->dynamic = dynamic; +} + +/** + * vkms_config_connector_is_enabled() - If the connector is dynamic + * @connector_cfg: The connector + */ +static inline bool +vkms_config_connector_is_dynamic(struct vkms_config_connector *connector_cfg) +{ + return connector_cfg->dynamic; +} + /* * vkms_config_plane_get_default_rotation() - Get the default rotation for a plane * @plane_cfg: Plane to get the default rotation from -- 2.51.0