From nobody Mon Feb 9 09:09:00 2026 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 DA5D134AB06; Wed, 29 Oct 2025 14:37:47 +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=1761748669; cv=none; b=LsF1jUxxHkeYwdTvTASrolHxCKEkE2QdTDWkmJM4o0lhBp/Ft456nyJpj4pFBgF3JsO7vQX15JaQhxRXpcCY/H+vbOPyybWx5qPEL//Ud4dsUiDxRY1LoXDozQAvN5hn1+FwA/1bemJiFTOizdLhWm6b/9oQIVui4yhfT0+XuzI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761748669; c=relaxed/simple; bh=xrzdaraOFExxLukUGdDstkMZ2KqagA/b+HcZMmpJXPU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jezf4K8iHDi+IkuCrMnL7uCq+w9ceo6C9jBTkQzonyYX0NTZ1WyWe/Hl+AYJgT9CkcxRUq+xOdryQKnM97vgTqBX7LeKawO9TtR30i706PB25d7SoIynOFH7wFx1eA7QG4AGtL8dTxF1wyKjRHf5Z1kpkHJIZ0b3Zcm9qavLpDU= 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=lzyL6J/r; 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="lzyL6J/r" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id 53462C0DA86; Wed, 29 Oct 2025 14:37:26 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id AB19B606E8; Wed, 29 Oct 2025 14:37:46 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 81C54117F813D; Wed, 29 Oct 2025 15:37:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1761748665; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=z9Dd9IU6DX4wrDs84ZKPS92OQlwhgVAYGOu5dRcVDJU=; b=lzyL6J/rpydJo98TsRXgfxoYR3Core4zBppBXy5dQGgCtpAFLdNX2bMZIeytP9LxjFtcpq 6YZSi0ZesEQ2CqSwHX44MzYRO6sywsAkhyBuFoAzL+NsOGuupn9Oacl8aMmn7VH1sHivCa HVJoHlyQ67om0Ysl/VbwtLN7AxHVM8Ek+foeJkun8HwZ5WvPmJbgH3vmgdWBpqpQkmeLn+ BIfzrdEi8RwOSFpsI5FCn/PBcjQp5ozgKYqyK8rXdGC0T6U6zBzNBhgGoU2wJpHsANfGA4 gwlFN21CwGCnoHn05oGF2tL9oAELHB4Umd825KHYf1LMcrNVRSwL15VzTd9GrA== From: Louis Chauvet Date: Wed, 29 Oct 2025 15:37:08 +0100 Subject: [PATCH RESEND v2 31/32] drm/vkms: Allow to hot-add connectors 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: quoted-printable Message-Id: <20251029-vkms-all-config-v2-31-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=5808; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=xrzdaraOFExxLukUGdDstkMZ2KqagA/b+HcZMmpJXPU=; b=owEBbQKS/ZANAwAKASCtLsZbECziAcsmYgBpAiZ+QghrFilKMCZFYcpyamJr0m3kZTyYOOqm3 1Bi8wtvk5SJAjMEAAEKAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCaQImfgAKCRAgrS7GWxAs 4rwcEADX8ko2qVQYN222//f88abW8+XGCX9zshE0H6hcocPra9HuorrVImCWM8cxentS8x0Ur8X RAAWJYgZZxxWqE8gaimxVIRND/IZIP8jD4nf5BjZPSZfWmXByoW1hFtzWDT03ROH8c2aR602rcn nF3BXWANtLLIck3zzyZjCWQVZUdtNCXNFHNtHE8zL14FWanByKMPol63laQzS26d94umOV9Dt/q 4HKEgQaiTs+gpv3+32SRsbr7ujk+gHrAQpoOd9uoKKj/Dz4T7AFdQMPrjfdBltZIqyJVrEasXGo mT4nd2SqY5f6mDt6kcqnDiLpFOkW5JZEmdTVTLr6QwLvTxC1QsdqxhTCbEPeEJD4DvDIHpiaDSF EBwHxqtfTazIlmvFZ0smpXwWRa1Gk6ywt/T70q5Zk24qeuceVa0BJdXcJL5NYAgP8ZXk5gD2hoy BBeVLo9BPnNmOLQWyB5nVQ8X/nyyp+dsuKpmgNmdeb49yrK0shQVTWx01Ec4isVArELC2DZxqa6 AUnzhxQ59ID4BEzAKxIM3jsJnjpgUvDX8s3XKUvU/0n6uA+55LYybkRF1UsaQzZTLXHubntgFlc Gv2HK61aNBCgvMqjhQvmZf3wlKAHYn/yIn+EZzy5hYaezrqYE/D88M1oWbDdP82ed5Cx1uwe1VB iqxsZGBwdzAduUw== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-Last-TLS-Session-Version: TLSv1.3 In order to allow creating dynamic connector, add the required infrastructure in vkms_connector. Co-developed-by: Jos=C3=A9 Exp=C3=B3sito Signed-off-by: Jos=C3=A9 Exp=C3=B3sito [Louis Chauvet: use drm_atomic_helper_connector_reset instead of drm_mode_config_reset because connector is not yet registered] Signed-off-by: Louis Chauvet --- drivers/gpu/drm/vkms/vkms_connector.c | 81 +++++++++++++++++++++++++++++++= ++++ drivers/gpu/drm/vkms/vkms_connector.h | 32 ++++++++++++++ drivers/gpu/drm/vkms/vkms_output.c | 9 ++++ 3 files changed, 122 insertions(+) diff --git a/drivers/gpu/drm/vkms/vkms_connector.c b/drivers/gpu/drm/vkms/v= kms_connector.c index 2c5f04af8784..bd0e368d5598 100644 --- a/drivers/gpu/drm/vkms/vkms_connector.c +++ b/drivers/gpu/drm/vkms/vkms_connector.c @@ -161,9 +161,90 @@ struct vkms_connector *vkms_connector_init_static(stru= ct vkms_device *vkmsdev, return connector; } =20 +static void vkms_connector_dynamic_destroy(struct drm_connector *connector) +{ + struct drm_device *dev =3D connector->dev; + struct vkms_connector *vkms_connector; + + drm_connector_cleanup(connector); + + vkms_connector =3D drm_connector_to_vkms_connector(connector); + drmm_kfree(dev, vkms_connector); +} + +static const struct drm_connector_funcs vkms_dynamic_connector_funcs =3D { + .fill_modes =3D drm_helper_probe_single_connector_modes, + .reset =3D drm_atomic_helper_connector_reset, + .atomic_duplicate_state =3D drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, + .destroy =3D vkms_connector_dynamic_destroy, + .detect =3D vkms_connector_detect, +}; + void vkms_trigger_connector_hotplug(struct vkms_device *vkmsdev) { struct drm_device *dev =3D &vkmsdev->drm; =20 drm_kms_helper_hotplug_event(dev); } + +struct vkms_connector *vkms_connector_hot_add(struct vkms_device *vkmsdev, + struct vkms_config_connector *connector_cfg) +{ + struct vkms_config_encoder *encoder_cfg; + struct vkms_connector *connector; + int ret; + unsigned long idx =3D 0; + + connector =3D drmm_kzalloc(&vkmsdev->drm, sizeof(*connector), GFP_KERNEL); + if (IS_ERR(connector)) + return connector; + ret =3D drm_connector_dynamic_init(&vkmsdev->drm, + &connector->base, + &vkms_dynamic_connector_funcs, + connector_cfg->type, + NULL); + if (ret) + return ERR_PTR(ret); + drm_connector_helper_add(&connector->base, &vkms_conn_helper_funcs); + + vkms_config_connector_for_each_possible_encoder(connector_cfg, idx, encod= er_cfg) { + ret =3D drm_connector_attach_encoder(&connector->base, + encoder_cfg->encoder); + if (ret) + return ERR_PTR(ret); + } + + drm_atomic_helper_connector_reset(&connector->base); + + vkms_connector_init(vkmsdev, connector, connector_cfg); + + ret =3D drm_connector_dynamic_register(&connector->base); + if (ret) + return ERR_PTR(ret); + + return connector; +} + +void vkms_connector_hot_remove(struct vkms_device *vkmsdev, + struct vkms_connector *connector) +{ + drm_connector_unregister(&connector->base); + drm_mode_config_reset(&vkmsdev->drm); + drm_connector_put(&connector->base); +} + +int vkms_connector_hot_attach_encoder(struct vkms_device *vkmsdev, + struct vkms_connector *connector, + struct drm_encoder *encoder) +{ + int ret; + + ret =3D drm_connector_attach_encoder(&connector->base, encoder); + if (ret) + return ret; + + drm_mode_config_reset(&vkmsdev->drm); + + return ret; +} diff --git a/drivers/gpu/drm/vkms/vkms_connector.h b/drivers/gpu/drm/vkms/v= kms_connector.h index 85f9082c710e..f53e3f85c684 100644 --- a/drivers/gpu/drm/vkms/vkms_connector.h +++ b/drivers/gpu/drm/vkms/vkms_connector.h @@ -34,4 +34,36 @@ struct vkms_connector *vkms_connector_init_static(struct= vkms_device *vkmsdev, */ void vkms_trigger_connector_hotplug(struct vkms_device *vkmsdev); =20 +/** + * vkms_connector_hot_add() - Create a connector after the device is creat= ed + * @vkmsdev: Device to hot-add the connector to + * @connector_cfg: Connector's configuration + * + * Returns: + * The connector or an error on failure. + */ +struct vkms_connector *vkms_connector_hot_add(struct vkms_device *vkmsdev, + struct vkms_config_connector *connector_cfg); + +/** + * vkms_connector_hot_remove() - Remove a connector after a device is crea= ted + * @connector: The connector to hot-remove + */ +void vkms_connector_hot_remove(struct vkms_device *vkmsdev, + struct vkms_connector *connector); + +/** + * vkms_connector_hot_attach_encoder() - Attach a connector to a encoder a= fter + * the device is created. + * @vkmsdev: Device containing the connector and the encoder + * @connector: Connector to attach to @encoder + * @encoder: Target encoder + * + * Returns: + * 0 on success or an error on failure. + */ +int vkms_connector_hot_attach_encoder(struct vkms_device *vkmsdev, + struct vkms_connector *connector, + struct drm_encoder *encoder); + #endif /* _VKMS_CONNECTOR_H_ */ diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms= _output.c index 44f8f53c9194..56c9c0b56151 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -116,5 +116,14 @@ int vkms_output_init(struct vkms_device *vkmsdev) =20 drm_mode_config_reset(dev); =20 + vkms_config_for_each_connector_dynamic(vkmsdev->config, connector_cfg) { + if (connector_cfg->enabled) { + connector_cfg->connector =3D vkms_connector_hot_add(vkmsdev, connector_= cfg); + + if (IS_ERR(connector_cfg->connector)) + return PTR_ERR(connector_cfg->connector); + } + } + return 0; } --=20 2.51.0