From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpout-03.galae.net (smtpout-03.galae.net [185.246.85.4]) (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 004743CF690 for ; Wed, 22 Apr 2026 16:50:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.85.4 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776876625; cv=none; b=O4XBj/DQZ1VdokHNEsQqlGus2WqybDfH9v7ei9QEHbWxhnt8G+mjOHBryrdzxLBm/5NYYNvm6iwGvduer88bpkSV4+IMmpvhRb5T9UhGtvebEy0hgM988JIqRTDpw3r7XseVeYDBlGsNOAE7ms/RQKjjJiNRQBQFJTtSwZYTb+A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776876625; c=relaxed/simple; bh=aMQpg+eOdXd2bQu0rCv0zPQcJXicPibyRUY6dFnStos=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iKGWqKkAz9uCA6ePKj43ZO7uCe8NA7DpTQv3Ep5jUstIclv/iNGnkYrk6R7vwg4/sT9M1Tj87Uz+tNMtEiq/RddVliAbUVnPz2T4HQIFUU71K2Ewd+Gh9rZb6slTkL/lpsHNj3kv32zVoxn0l9uwiWc03iQrSsxOsiqCpK7b0bE= 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=wrDI/5/v; arc=none smtp.client-ip=185.246.85.4 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="wrDI/5/v" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id 625704E42AC5; Wed, 22 Apr 2026 16:50:21 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 3100C5FA8F; Wed, 22 Apr 2026 16:50:21 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 69CB7104609C6; Wed, 22 Apr 2026 18:50:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1776876619; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=DntHbu2rSMYFHpEWx255KbnWkh4pOnb9ECybKnrJJcs=; b=wrDI/5/v+8zw2rPuKKx41hZrAdBSgJjZKJJs59yWjhSICAwYTZlRmH2ODjPbpRrf+cmiuo EsfIJDiFXb93xOmgk7uyX++C1PxFmPFV27K5o4w7zj9vsDpYJggIFyLYtvYmlHtots9g7Y gmja9nO5RNEaHQdjYB51lTIYYCKuHUw+cTXWde91QEZACKUQKOTNTVr47QvFno+S9CVIit 6UXAGzdxJpOAlb46OuiQVvUVsY+cFLov3PH8MJYbHyiAfHeB/9d5eRTgU6krCJX0wEwMoy 1TobAS4Wb5XQTi5tje1zqF9KfUf/wrl5i9Mz9XQPwBDjcazMvIIqImvUAIWWiw== From: Louis Chauvet Date: Wed, 22 Apr 2026 18:48:30 +0200 Subject: [PATCH v4 33/37] drm/vkms: Store the enabled/disabled status for connector Precedence: bulk X-Mailing-List: linux-doc@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: <20260422-vkms-all-config-v4-33-dbb52e9aadc3@bootlin.com> References: <20260422-vkms-all-config-v4-0-dbb52e9aadc3@bootlin.com> In-Reply-To: <20260422-vkms-all-config-v4-0-dbb52e9aadc3@bootlin.com> To: Haneen Mohammed , Simona Vetter , Melissa Wen , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , jose.exposito89@gmail.com, Jonathan Corbet , Shuah Khan , Miguel Ojeda , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt 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 , llvm@lists.linux.dev, Luca Ceresoli X-Mailer: b4 0.16-dev 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 Reviewed-by: Luca Ceresoli Signed-off-by: Louis Chauvet --- .clang-format | 2 + 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 +++++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_output.c | 2 +- 5 files changed, 79 insertions(+), 1 deletion(-) diff --git a/.clang-format b/.clang-format index 1cc151e2adcc..0d985d30efb2 100644 --- a/.clang-format +++ b/.clang-format @@ -724,6 +724,8 @@ ForEachMacros: - 'v4l2_m2m_for_each_src_buf_safe' - 'virtio_device_for_each_vq' - 'vkms_config_for_each_connector' + - 'vkms_config_for_each_connector_static' + - 'vkms_config_for_each_connector_dynamic' - 'vkms_config_for_each_crtc' - 'vkms_config_for_each_encoder' - 'vkms_config_for_each_plane' diff --git a/drivers/gpu/drm/vkms/tests/vkms_config_test.c b/drivers/gpu/drm/vkms/tests/vkms_config_test.c index 2b49745ee026..fda23f05a0a5 100644 --- a/drivers/gpu/drm/vkms/tests/vkms_config_test.c +++ b/drivers/gpu/drm/vkms/tests/vkms_config_test.c @@ -220,6 +220,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 eee6401a3e4f..a660e1aaa9c7 100644 --- a/drivers/gpu/drm/vkms/vkms_config.c +++ b/drivers/gpu/drm/vkms/vkms_config.c @@ -601,6 +601,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", @@ -614,6 +616,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; @@ -948,6 +952,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 3489c682b4af..b6912a90d687 100644 --- a/drivers/gpu/drm/vkms/vkms_config.h +++ b/drivers/gpu/drm/vkms/vkms_config.h @@ -131,6 +131,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 connector 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 @@ -150,6 +152,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; @@ -193,6 +197,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 @@ -471,6 +493,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 diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c index 406a22f1b963..13c4ca5fd39d 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -93,7 +93,7 @@ int vkms_output_init(struct vkms_device *vkmsdev) } } - vkms_config_for_each_connector(vkmsdev->config, connector_cfg) { + vkms_config_for_each_connector_static(vkmsdev->config, connector_cfg) { struct vkms_config_encoder *possible_encoder; unsigned long idx = 0; -- 2.54.0