From nobody Sun Feb 8 17:42:48 2026 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4B49119DF53 for ; Tue, 13 Aug 2024 10:51:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723546320; cv=none; b=HDWghC78jdsPkjyU5u5TljZrKvT9JoJwxv6XrjylgO9ERTNtlY/9/S4+Wq5TdQcXmyK7Zofy9kIfxohpbmsFD1olFAxkeBgG/VydS/OICtmwa/UFB1g18xX566exBAKo5RWUB5R5xnHISMHUME/5sR7T+BfI1wV/Fq3T2YRd4to= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723546320; c=relaxed/simple; bh=5wPY00ge369+Bs+WSOcxylUyUb+ORoaa5aka41GPk4g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=du2bs2W/RvLcaHr2i78neuPFPEaXRpNVzcLbddfd2UA7LdZ7wL9I5oJibmKOLbaf2g+N+4Pct+wX0qctQ1fULdDtwfE0fCcUAg/xft8FxBsEu32Gcr7pKxy4azmsricUq/E+S6XFud5r2Bef5nDOvMiCFoZy5FbbKBu0xKMrjwU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=SGCdGkJl; arc=none smtp.client-ip=209.85.167.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SGCdGkJl" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-530e2235688so5788202e87.3 for ; Tue, 13 Aug 2024 03:51:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723546316; x=1724151116; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GIG00hBvhxwE6VfxQ1Dl1AavFjjBn2BviUu5FBbH+3g=; b=SGCdGkJlqMMCKeiiTMgzh2+LUU39+idAEJiEwH8B8YnXLvyy1My89i4j8jbO+oVkr9 DUUr1OrosPpr590qvv+GGBAKW15F7Rh2ON6TCisnBjEGlx9zTBf2t3hOUR+vh3VpVB3Z PFbEoToPxlMph0MJMNEnqy6kEyzSSBQpGJbmk6R11TdHHZ097pc9QVb7r0hVcvWfS7M9 jTBCmPfyQu96YNYXIVA52Lr0sMCME4kEFUpPOtBn1JNdpXXvqGTJKhP33Q5Pxgkc6RUw pl+/+6OpVxbf6EpciSlBwP7j4/T4DxYhPFXjAEP47N27E6zNeBYlGwR8zah7ITy02cA8 5Mxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723546316; x=1724151116; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GIG00hBvhxwE6VfxQ1Dl1AavFjjBn2BviUu5FBbH+3g=; b=fd/RnI1w6+7GHTejKbdLvT7jjkVw89yfnOQbUq7NXBmyeJplouSi0L2X+XTCNbP/2F EMeWQNewBtowiNK3yhj9IzYGD3JVeZyUsoXU6VzEF6X5l1EgEz/FyJIgJq6NUxjY5Hjo QungNj100HjmFPgm3WXr3a3V04zJixkj6TtBANuQPcdMmZ79g28MjDPWIIo38LTadBIr L/ZYZjKUHiAyKBZU5pWmcjuyF6+3e3PHQUrlNc618Q5WxSAAxq14T5FQ+yR8xim6rUq2 3kjQsgU1bILHYo6JsjWdTuYMy79GeMcnnaO3R29E3s3g8Ni7mFQH7osMPZ4CPfgKAU5I Nngg== X-Forwarded-Encrypted: i=1; AJvYcCVtftVk/g+aZYz/JG7YYEKn2R7TfpY+wdPEJ5hkpF6RHof9kAOQWBxAj5zQ3xyO0/H0rgnyuubPCRSiMwArrQYrGECQunY1QbQOfmW+ X-Gm-Message-State: AOJu0Yxabj23Ui2s3pUu1caJvEtSqXDTx3JYZaF69oOcKXSXV0KldvTc flhdO2EY8Tpo1pJJzTjE0Di5WrVKG79485IsRUasE2TOpHQsy5g5 X-Google-Smtp-Source: AGHT+IHG61sFSXaG2KPmxHnV7dm/Gc1K15rhK/tEp3tOyYNwnbyxbnWi9QRN7AYcotU8SvHARdSFyw== X-Received: by 2002:a05:6512:31ce:b0:52e:9b15:1c60 with SMTP id 2adb3069b0e04-53213680d76mr1857158e87.48.1723546315942; Tue, 13 Aug 2024 03:51:55 -0700 (PDT) Received: from fedora.. ([213.94.26.172]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-429d877e066sm17290785e9.1.2024.08.13.03.51.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 03:51:55 -0700 (PDT) From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= To: rodrigosiqueiramelo@gmail.com Cc: melissa.srw@gmail.com, mairacanal@riseup.net, hamohammed.sa@gmail.com, daniel@ffwll.ch, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, louis.chauvet@bootlin.com, =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Subject: [RFC PATCH 14/17] drm/vkms: Allow to configure multiple encoders Date: Tue, 13 Aug 2024 12:44:25 +0200 Message-ID: <20240813105134.17439-15-jose.exposito89@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240813105134.17439-1-jose.exposito89@gmail.com> References: <20240813105134.17439-1-jose.exposito89@gmail.com> 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 Add a list of encoder configurations to vkms_config and add as many encoders as configured during output initialization. For backwards compatibility, create a single encoder in the default configuration. Signed-off-by: Jos=C3=A9 Exp=C3=B3sito --- Documentation/gpu/vkms.rst | 16 +++ drivers/gpu/drm/vkms/vkms_config.h | 3 + drivers/gpu/drm/vkms/vkms_configfs.c | 184 ++++++++++++++++++++++++--- 3 files changed, 188 insertions(+), 15 deletions(-) diff --git a/Documentation/gpu/vkms.rst b/Documentation/gpu/vkms.rst index c69be063d3b4..b6ceb8c48310 100644 --- a/Documentation/gpu/vkms.rst +++ b/Documentation/gpu/vkms.rst @@ -75,6 +75,7 @@ And directories are created for each configurable item of= the display pipeline:: =20 tree /config/vkms/my-vkms /config/vkms/my-vkms + =E2=94=9C=E2=94=80=E2=94=80 connectors =E2=94=9C=E2=94=80=E2=94=80 crtcs =E2=94=9C=E2=94=80=E2=94=80 enabled =E2=94=94=E2=94=80=E2=94=80 encoders @@ -100,16 +101,31 @@ Encoders can be linked to CRTCs by creating a symboli= c link under =20 sudo ln -s /config/vkms/my-vkms/crtcs/crtc0 /config/vkms/my-vkms/encoder= s/encoder0/possible_crtcs =20 +Next, create one or more connectors:: + + sudo mkdir /config/vkms/my-vkms/connectors/connector0 + +The status of the connector can be changed writing ``1`` (connected), ``2`` +(disconnected) or ``3`` (unknown) to the ``status`` attribute and they can= be +linked to encoders by creating a symbolic link under ``possible_encoders``= :: + + sudo ln -s /config/vkms/my-vkms/encoders/encoder0 /config/vkms/my-vkms/c= onnectors/connector0/possible_encoders + Once you are done configuring the VKMS instance, enable it:: =20 echo "1" | sudo tee /config/vkms/my-vkms/enabled =20 +Note that the connector ``status`` can be changed once the VKMS instance is +enabled to emulate hot-plug/unplug. + Finally, you can remove the VKMS instance disabling it:: =20 echo "0" | sudo tee /config/vkms/my-vkms/enabled =20 Or removing the top level directory and its subdirectories:: =20 + sudo rm /config/vkms/my-vkms/connectors/*/possible_encoders/* + sudo rmdir /config/vkms/my-vkms/connectors/* sudo rm /config/vkms/my-vkms/encoders/*/possible_crtcs/* sudo rmdir /config/vkms/my-vkms/encoders/* sudo rmdir /config/vkms/my-vkms/crtcs/* diff --git a/drivers/gpu/drm/vkms/vkms_config.h b/drivers/gpu/drm/vkms/vkms= _config.h index f9423533a7f3..cf45e3f6ae92 100644 --- a/drivers/gpu/drm/vkms/vkms_config.h +++ b/drivers/gpu/drm/vkms/vkms_config.h @@ -40,6 +40,9 @@ struct vkms_config_connector { enum drm_connector_status status; /* only set when instantiated */ struct drm_connector *connector; + /* only used if created from configfs */ + struct config_group connector_group; + struct config_group possible_encoders_group; }; =20 struct vkms_config { diff --git a/drivers/gpu/drm/vkms/vkms_configfs.c b/drivers/gpu/drm/vkms/vk= ms_configfs.c index c0b62fb93dc0..d2369f53e2d8 100644 --- a/drivers/gpu/drm/vkms/vkms_configfs.c +++ b/drivers/gpu/drm/vkms/vkms_configfs.c @@ -21,6 +21,8 @@ static bool is_configfs_registered; * Each of its items represent a CRTC * @encoders_group: Default subgroup of @device_group at * "/config/vkms/encoders". Each of its items represent a encoder + * @connectors_group: Default subgroup of @device_group at + * "/config/vkms/connectors". Each of its items represent a connector * @lock: Lock used to project concurrent access to the configuration attr= ibutes * @enabled: Protected by @lock. The device is created or destroyed when t= his * option changes @@ -30,6 +32,7 @@ struct vkms_configfs { struct config_group device_group; struct config_group crtcs_group; struct config_group encoders_group; + struct config_group connectors_group; =20 /* protected by @lock */ struct mutex lock; @@ -57,6 +60,18 @@ struct vkms_configfs { #define encoder_possible_crtcs_item_to_vkms_config_encoder(item) \ container_of(to_config_group(item), struct vkms_config_encoder, possible_= crtcs_group) =20 +#define connectors_group_to_vkms_configfs(group) \ + container_of(group, struct vkms_configfs, connectors_group) + +#define connectors_item_to_vkms_configfs(item) \ + container_of(to_config_group(item), struct vkms_configfs, connectors_grou= p) + +#define connector_item_to_vkms_config_connector(item) \ + container_of(to_config_group(item), struct vkms_config_connector, connect= or_group) + +#define connector_possible_encoders_item_to_vkms_config_connector(item) \ + container_of(to_config_group(item), struct vkms_config_connector, possibl= e_encoders_group) + static ssize_t crtc_cursor_show(struct config_item *item, char *page) { struct vkms_config_crtc *crtc_cfg =3D crtcs_item_to_vkms_config_crtc(item= ); @@ -287,6 +302,154 @@ static struct config_item_type encoders_group_type = =3D { .ct_owner =3D THIS_MODULE, }; =20 +static int connector_possible_encoders_allow_link(struct config_item *src, + struct config_item *target) +{ + struct vkms_config_connector *connector_cfg; + struct vkms_config_encoder *encoder_cfg; + + if (target->ci_type !=3D &encoder_group_type) + return -EINVAL; + + connector_cfg =3D connector_possible_encoders_item_to_vkms_config_connect= or(src); + encoder_cfg =3D encoders_item_to_vkms_config_encoder(target); + + if (connector_cfg->possible_encoders & BIT(encoder_cfg->index)) + return -EINVAL; + + connector_cfg->possible_encoders |=3D BIT(encoder_cfg->index); + + return 0; +} + +static void connector_possible_encoders_drop_link(struct config_item *src, + struct config_item *target) +{ + struct vkms_config_connector *connector_cfg; + struct vkms_config_encoder *encoder_cfg; + + connector_cfg =3D connector_possible_encoders_item_to_vkms_config_connect= or(src); + encoder_cfg =3D encoders_item_to_vkms_config_encoder(target); + + connector_cfg->possible_encoders &=3D ~BIT(encoder_cfg->index); +} + +static struct configfs_item_operations connector_possible_encoders_item_op= s =3D { + .allow_link =3D &connector_possible_encoders_allow_link, + .drop_link =3D &connector_possible_encoders_drop_link, +}; + +static struct config_item_type connector_possible_encoders_group_type =3D { + .ct_item_ops =3D &connector_possible_encoders_item_ops, + .ct_owner =3D THIS_MODULE, +}; + +static ssize_t connector_status_show(struct config_item *item, char *page) +{ + struct vkms_config_connector *connector_cfg =3D + connector_item_to_vkms_config_connector(item); + + return sprintf(page, "%d\n", connector_cfg->status); +} + +static ssize_t connector_status_store(struct config_item *item, const char= *page, + size_t count) +{ + struct vkms_configfs *configfs; + struct vkms_config_connector *connector_cfg; + int status; + + if (kstrtoint(page, 10, &status)) + return -EINVAL; + + switch (status) { + case connector_status_connected: + case connector_status_disconnected: + case connector_status_unknown: + break; + default: + return -EINVAL; + } + + configfs =3D connectors_item_to_vkms_configfs(item->ci_parent); + connector_cfg =3D connector_item_to_vkms_config_connector(item); + + vkms_update_connector_status(configfs->vkms_config, connector_cfg, status= ); + + return (ssize_t)count; +} + +CONFIGFS_ATTR(connector_, status); + +static struct configfs_attribute *connector_group_attrs[] =3D { + &connector_attr_status, + NULL, +}; + +static const struct config_item_type connector_group_type =3D { + .ct_attrs =3D connector_group_attrs, + .ct_owner =3D THIS_MODULE, +}; + +static struct config_group *make_connectors_group(struct config_group *gro= up, + const char *name) +{ + struct vkms_configfs *configfs =3D connectors_group_to_vkms_configfs(grou= p); + struct vkms_config_connector *connector_cfg; + int ret; + + mutex_lock(&configfs->lock); + + if (configfs->enabled) { + ret =3D -EINVAL; + goto err_unlock; + } + + connector_cfg =3D vkms_config_add_connector(configfs->vkms_config, 0, + connector_status_connected); + if (IS_ERR(connector_cfg)) { + ret =3D PTR_ERR(connector_cfg); + goto err_unlock; + } + + config_group_init_type_name(&connector_cfg->connector_group, name, + &connector_group_type); + + config_group_init_type_name(&connector_cfg->possible_encoders_group, + "possible_encoders", + &connector_possible_encoders_group_type); + configfs_add_default_group(&connector_cfg->possible_encoders_group, + &connector_cfg->connector_group); + + mutex_unlock(&configfs->lock); + + return &connector_cfg->connector_group; + +err_unlock: + mutex_unlock(&configfs->lock); + return ERR_PTR(ret); +} + +static void drop_connectors_group(struct config_group *group, + struct config_item *item) +{ + struct vkms_configfs *configfs =3D connectors_group_to_vkms_configfs(grou= p); + struct vkms_config_connector *connector_cfg =3D + connector_item_to_vkms_config_connector(item); + + vkms_config_destroy_connector(configfs->vkms_config, connector_cfg); +} + +static struct configfs_group_operations connectors_group_ops =3D { + .make_group =3D &make_connectors_group, + .drop_item =3D &drop_connectors_group, +}; + +static struct config_item_type connectors_group_type =3D { + .ct_group_ops =3D &connectors_group_ops, + .ct_owner =3D THIS_MODULE, +}; + static ssize_t device_enabled_show(struct config_item *item, char *page) { struct vkms_configfs *configfs =3D config_item_to_vkms_configfs(item); @@ -341,9 +504,7 @@ static struct config_group *make_device_group(struct co= nfig_group *group, const char *name) { struct vkms_configfs *configfs; - struct vkms_config_connector *connector_cfg =3D NULL; char *config_name; - int ret; =20 if (strcmp(name, DEFAULT_DEVICE_NAME) =3D=3D 0) return ERR_PTR(-EINVAL); @@ -358,8 +519,8 @@ static struct config_group *make_device_group(struct co= nfig_group *group, config_name =3D config_item_name(&configfs->device_group.cg_item); configfs->vkms_config =3D vkms_config_create(config_name); if (IS_ERR(configfs->vkms_config)) { - ret =3D PTR_ERR(configfs->vkms_config); - goto err_kfree; + kfree(configfs); + return ERR_CAST(configfs->vkms_config); } =20 config_group_init_type_name(&configfs->crtcs_group, "crtcs", @@ -372,19 +533,12 @@ static struct config_group *make_device_group(struct = config_group *group, configfs_add_default_group(&configfs->encoders_group, &configfs->device_group); =20 - connector_cfg =3D vkms_config_add_connector(configfs->vkms_config, BIT(0), - connector_status_connected); - if (IS_ERR(connector_cfg)) { - ret =3D PTR_ERR(connector_cfg); - goto err_kfree; - } + config_group_init_type_name(&configfs->connectors_group, "connectors", + &connectors_group_type); + configfs_add_default_group(&configfs->connectors_group, + &configfs->device_group); =20 return &configfs->device_group; - -err_kfree: - kfree(configfs); - kfree(connector_cfg); - return ERR_PTR(ret); } =20 static void drop_device_group(struct config_group *group, --=20 2.46.0