From nobody Mon Feb 9 10:27:05 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 7EC8E23F424; Sat, 18 Oct 2025 02:02:21 +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=1760752943; cv=none; b=aOK98xVNYCCwsgY4f1H7n+0eUM3ULVJxt3V60zhZ6nhO5VI8DDSAngurG+tfyszU2mji+74gUfypFmY8kr8HduKan2SHocP6j1OgVYXiSvR72+R57pYmlyxIBOH0nPHdL21p7pRweMGZAoerRqZXaDdFfo+rDVsLDxK2Pmu4KTA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760752943; c=relaxed/simple; bh=mlVitEKgPRWXex7IDiZvIpJldU+tXkQjiow9dXAQlR4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JhHEGcc2dTzv2RVWs+mT50yblFMO0L9cgkW4FWzbqLM2KXxnV7dRG3TbP6uR1QarxR8NPP99cOZFp5gYOS9Fpcxias2ri5YDG8adSs4mVmBiNuGw0JAhkV+sVfMvROTAeWyIEXh3qNnmGpm+IT1e+VGGbMsYsC8Pla+MbBLXltw= 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=Zmt70XMT; 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="Zmt70XMT" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id 05BFFC035A7; Sat, 18 Oct 2025 02:02:01 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 5BF3560701; Sat, 18 Oct 2025 02:02:20 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id D0C90102F2380; Sat, 18 Oct 2025 04:02:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1760752939; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=OSSumRs3rNpXnBUd0cppRmxG66Aojnzy15R3KfAeBrQ=; b=Zmt70XMTf1skdRiNA4G8ysE+BRB6fShH1wFmQkJFgFI2J7Z7f17kGVywa2/uG199FefvTZ plfX4gZhTg2EGfPMhwE5ZODF6WK/L17+buIBgfA6eWQeZxo784wy6xdAIpPMKqYAQCT19q SlEUV2oDkHgcGF7np6aWrXld0OL0SS3m9lf2jT9fhQIvIkN/M2E9gP4x9jQ2EMHFjN7ruQ Kd8KM8XsMWsccV3wl/oGnSj/vl4HS3vukwDCDPTuuszxstFyDtXTIb00ZfW4m53TnJFyhw R7QHip4N7/Pye14BZSkSvoRH5Fb9f2OwtCRuwY0MlbWPawsVCDAxZ/2vKSjiPA== From: Louis Chauvet Date: Sat, 18 Oct 2025 04:01:14 +0200 Subject: [PATCH 14/22] drm/vkms: Introduce config for connector type 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: <20251018-vkms-all-config-v1-14-a7760755d92d@bootlin.com> References: <20251018-vkms-all-config-v1-0-a7760755d92d@bootlin.com> In-Reply-To: <20251018-vkms-all-config-v1-0-a7760755d92d@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=6691; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=mlVitEKgPRWXex7IDiZvIpJldU+tXkQjiow9dXAQlR4=; b=owEBbQKS/ZANAwAKASCtLsZbECziAcsmYgBo8vT+PtjrYP9moT4P2zE3J+YIL4PjpllBJo6iD lrwHxXfuYaJAjMEAAEKAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCaPL0/gAKCRAgrS7GWxAs 4oNXD/9ojy5OVd19/m+p7byF/GH7mCqTZuCk4J3on6t48G2pW2rUvESb/bqaN8joxTMkl7RFbfs qQzKmTEpjtyYXulEHexRtjm2uyStAAz6j40ky3+AcEo8SF6UwW60r96N3z/vrqo9vf5TZkLAuhn Jv4hqb/xcfBbmJK+/4pi84JlzYjddsVNcmTagH7qR49Gbge33UdsF6N2sKQV4ylvzsApbBqIsqA xu0fKei1hZ2s3i8t2+uJdtPSCN/n+hPeX2rn/VcylMp8diuv5QkZxoX+eAXGuaqpbpKB5zZsJSD Thx/vj/UCEmZiohBii8CrCIKS4NVcrSCNIF3Wcg0ARLftmI/fMPd5USfoAC0vWX6DemH1rEOv+u S9celWcV3x1pDszjVOaMov0Dcswfj8syV06sLNJt1K4U6zNCQg1CikIjDjw9PtqCew8wUajYIvT 62gb8oGbI/pD1GF9GQTyx8KG5MwgaC5OOOc4gBXDoNm0jHHOwHvoSm1FNmJTULGsXwMn3/X0bkJ C2sICxEV7qpoEvZ20ArkLN1CXTkioMxiAM6a0YC88U6WjM/MQ0cGTPJO7yZNSHb/6geRI5LyiBt tMnGkVm302JRCrrvhV84SQhUMnVZjND7Z0QEXqQccNfH2CiKMmYuPwCV0PhzzZ4VFpXGRyNhy1N Gg+ImvYK/qSCf+w== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-Last-TLS-Session-Version: TLSv1.3 In order to emulate connector-specific behavior, add connector type configuration. Signed-off-by: Louis Chauvet --- drivers/gpu/drm/vkms/tests/vkms_config_test.c | 6 ++++++ drivers/gpu/drm/vkms/vkms_config.c | 1 + drivers/gpu/drm/vkms/vkms_config.h | 24 ++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_connector.c | 5 +++-- drivers/gpu/drm/vkms/vkms_connector.h | 3 ++- drivers/gpu/drm/vkms/vkms_drv.h | 1 + drivers/gpu/drm/vkms/vkms_output.c | 2 +- 7 files changed, 38 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/vkms/tests/vkms_config_test.c b/drivers/gpu/dr= m/vkms/tests/vkms_config_test.c index f2b38b436252..8633210342a4 100644 --- a/drivers/gpu/drm/vkms/tests/vkms_config_test.c +++ b/drivers/gpu/drm/vkms/tests/vkms_config_test.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ =20 +#include "drm/drm_mode.h" #include =20 #include "../vkms_config.h" @@ -126,6 +127,7 @@ static void vkms_config_test_default_config(struct kuni= t *test) struct vkms_config *config; struct vkms_config_plane *plane_cfg; struct vkms_config_crtc *crtc_cfg; + struct vkms_config_connector *connector_cfg; int n_primaries =3D 0; int n_cursors =3D 0; int n_overlays =3D 0; @@ -182,6 +184,10 @@ static void vkms_config_test_default_config(struct kun= it *test) =20 /* Connectors */ KUNIT_EXPECT_EQ(test, vkms_config_get_num_connectors(config), 1); + vkms_config_for_each_connector(config, connector_cfg) { + KUNIT_EXPECT_EQ(test, vkms_config_connector_get_type(connector_cfg), + DRM_MODE_CONNECTOR_VIRTUAL); + } =20 KUNIT_EXPECT_TRUE(test, vkms_config_is_valid(config)); =20 diff --git a/drivers/gpu/drm/vkms/vkms_config.c b/drivers/gpu/drm/vkms/vkms= _config.c index 5da34a3e8114..20750c9f6d08 100644 --- a/drivers/gpu/drm/vkms/vkms_config.c +++ b/drivers/gpu/drm/vkms/vkms_config.c @@ -771,6 +771,7 @@ struct vkms_config_connector *vkms_config_create_connec= tor(struct vkms_config *c =20 connector_cfg->config =3D config; connector_cfg->status =3D connector_status_connected; + vkms_config_connector_set_type(connector_cfg, DRM_MODE_CONNECTOR_VIRTUAL); xa_init_flags(&connector_cfg->possible_encoders, XA_FLAGS_ALLOC); =20 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 267e45f5a617..36d289a010f6 100644 --- a/drivers/gpu/drm/vkms/vkms_config.h +++ b/drivers/gpu/drm/vkms/vkms_config.h @@ -126,6 +126,7 @@ struct vkms_config_encoder { * struct vkms_config_connector * * @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 * @status: Status (connected, disconnected...) of the connector * @possible_encoders: Array of encoders that can be used with this connec= tor @@ -138,6 +139,7 @@ struct vkms_config_connector { struct list_head link; struct vkms_config *config; =20 + int type; enum drm_connector_status status; struct xarray possible_encoders; =20 @@ -315,6 +317,28 @@ vkms_config_plane_set_type(struct vkms_config_plane *p= lane_cfg, } =20 /** + * vkms_config_connector_get_type() - Return the connector type + * @connector_cfg: Connector to get the type from + */ +static inline int +vkms_config_connector_get_type(struct vkms_config_connector *connector_cfg) +{ + return connector_cfg->type; +} + +/** + * vkms_config_connector_set_type() - Set the connector type + * @connector_cfg: Connector to set the type to + * @type: New connector type + */ +static inline void +vkms_config_connector_set_type(struct vkms_config_connector *connector_cfg, + int type) +{ + connector_cfg->type =3D type; +} + +/* * 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_connector.c b/drivers/gpu/drm/vkms/v= kms_connector.c index b0a6b212d3f4..5a87dc2d4c63 100644 --- a/drivers/gpu/drm/vkms/vkms_connector.c +++ b/drivers/gpu/drm/vkms/vkms_connector.c @@ -68,7 +68,8 @@ static const struct drm_connector_helper_funcs vkms_conn_= helper_funcs =3D { .best_encoder =3D vkms_conn_best_encoder, }; =20 -struct vkms_connector *vkms_connector_init(struct vkms_device *vkmsdev) +struct vkms_connector *vkms_connector_init(struct vkms_device *vkmsdev, + struct vkms_config_connector *connector_cfg) { struct drm_device *dev =3D &vkmsdev->drm; struct vkms_connector *connector; @@ -79,7 +80,7 @@ struct vkms_connector *vkms_connector_init(struct vkms_de= vice *vkmsdev) return ERR_PTR(-ENOMEM); =20 ret =3D drmm_connector_init(dev, &connector->base, &vkms_connector_funcs, - DRM_MODE_CONNECTOR_VIRTUAL, NULL); + vkms_config_connector_get_type(connector_cfg), NULL); if (ret) return ERR_PTR(ret); =20 diff --git a/drivers/gpu/drm/vkms/vkms_connector.h b/drivers/gpu/drm/vkms/v= kms_connector.h index ed312f4eff3a..a124c5403697 100644 --- a/drivers/gpu/drm/vkms/vkms_connector.h +++ b/drivers/gpu/drm/vkms/vkms_connector.h @@ -24,7 +24,8 @@ struct vkms_connector { * Returns: * The connector or an error on failure. */ -struct vkms_connector *vkms_connector_init(struct vkms_device *vkmsdev); +struct vkms_connector *vkms_connector_init(struct vkms_device *vkmsdev, + struct vkms_config_connector *connector_cfg); =20 /** * vkms_trigger_connector_hotplug() - Update the device's connectors status diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index 9ad286f043b5..07bdf3f550ae 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -226,6 +226,7 @@ struct vkms_output { =20 struct vkms_config; struct vkms_config_plane; +struct vkms_config_connector; =20 /** * struct vkms_device - Description of a VKMS device diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms= _output.c index 22208d02afa4..217f054d9598 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -96,7 +96,7 @@ int vkms_output_init(struct vkms_device *vkmsdev) struct vkms_config_encoder *possible_encoder; unsigned long idx =3D 0; =20 - connector_cfg->connector =3D vkms_connector_init(vkmsdev); + connector_cfg->connector =3D vkms_connector_init(vkmsdev, connector_cfg); if (IS_ERR(connector_cfg->connector)) { DRM_ERROR("Failed to init connector\n"); return PTR_ERR(connector_cfg->connector); --=20 2.51.0