From patchwork Fri Mar 7 16:33:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Sm9zw6kgRXhww7NzaXRv?= X-Patchwork-Id: 14006745 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 83EB4C19F32 for ; Fri, 7 Mar 2025 16:34:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B512F10EBF6; Fri, 7 Mar 2025 16:34:19 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="e2gbWvQp"; dkim-atps=neutral Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by gabe.freedesktop.org (Postfix) with ESMTPS id 067FF10EBF0 for ; Fri, 7 Mar 2025 16:34:11 +0000 (UTC) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-438a39e659cso12269355e9.2 for ; Fri, 07 Mar 2025 08:34:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741365250; x=1741970050; darn=lists.freedesktop.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=3oQHAhb9mjt4fInrJwzIGdl9Ptg528EudUlnjp2MNA8=; b=e2gbWvQpCqrFZBmKqhjkSXDzW/WBITQRmtz//vWIborGKRf6bKdIege7N/x5W6+C7j vA15yTXVjvJO20Ibx6zdZWKvHXkjjxesbw7+APKPt0YKcOBby/9mwuSXLxjTJ5ZQtI1D lqnMVoVGjxTC8j3cTN/PkPfXSR+GazXsp1SKn1HVLJwegsym0YI5YPI2zkN1Ox1Egg/J Xa4/aadAPSvp6ed/kwuwxaP3Xc4IHUCdJEjTJ/A3PKg+Jroo9Nhqo/34aBg+6qc1GAKy V6i4iyJOh9YuTBljdS4UtMEntnIJenQDZRC1nDrqB79OqQ9qqsPz91nmYXxk7/zfzhY7 hWHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741365250; x=1741970050; 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=3oQHAhb9mjt4fInrJwzIGdl9Ptg528EudUlnjp2MNA8=; b=BP3T6htdwaSZM8eJ9tLMIoNrx9it9lGnkhDmL1XpjZHusRWDxR//Y+/iHl2GjCw7r9 IWjekyAge4JODhbBFM7Nz/IHwwsQ9ttiSaZHdl02+7m3XGU7xScNe9BnpkRQOVscKvSu xJKyRxc1bK5D+nPAJ+7IcfhLE4L5qpH067mG/fX7KnqKgVEGgklhdIjmO8CGJ+eyR9Gt RtXPOSqaDK257Xd4dsR3euTpTN8dQJfeQcfwpaHhXzxTB0lGqnfVEWGII6oZNT331FIA ZoX+hBODorga1xtKc8EASVHtkjJ93EAyPyWIb6L96l4pWMfkN6RE1X+o2vIYGn+jXzbI 5UYA== X-Forwarded-Encrypted: i=1; AJvYcCWULSJvIQ24lsYgoNWK6yXwmV4ELs5FIEam5SLVWOt7nvPzy8RDny61eXXKl+/Cp10ZMZWgGQFYSFQ=@lists.freedesktop.org X-Gm-Message-State: AOJu0Yxo8a0khQn0fPhoILtw9g8kEY/A4BAA7fFgZ4wE3hw6zhpKUmk9 9COz3k3xb/VA2ozKG5XWX3d2ZoR+vYPzjMUsOTkdfHtylt+/IupI X-Gm-Gg: ASbGnctaG+euMgtErVjRXtxDq8solqWTVvWNp01QpPyyrPEM51bcL6kKxOq6HftLWq2 FAEY1/+G4DRyN7vK/ZY3rxvmFWUpiASpC4CuDlhY6TOAwFu09KOMb14NVOm+/sXHco8JGzRFe0z 7Pn7czZeTAo2BVwhmyKtJXXiEuzg3RNJJ0QeWldx34P+vtIlyad3MQnyBkn8rT0xGSiTXn2Oebs VwIRrkAgPnVQ++t+H3tkarlN/kcqSAQqzXjp9OTcGWdyWzaAcGmhE5coLp8XG4VugsNfFrBnx+K GX9J3C6dBSf3L8N9VIAkDzZH5FMk8fYN+z1hEe0Q1i9pVCI= X-Google-Smtp-Source: AGHT+IFsrm3QntpbyPuP4HXlK5m2E23x9fnNTDWBthJFYTPmQuedXlywOAqGxiFsqYouDrx4t6NaqA== X-Received: by 2002:a5d:6d04:0:b0:391:10c5:d1c6 with SMTP id ffacd0b85a97d-39132d77194mr2387021f8f.2.1741365249931; Fri, 07 Mar 2025 08:34:09 -0800 (PST) Received: from fedora.. ([213.94.27.232]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c019557sm6031436f8f.50.2025.03.07.08.34.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Mar 2025 08:34:09 -0800 (PST) From: =?utf-8?b?Sm9zw6kgRXhww7NzaXRv?= To: louis.chauvet@bootlin.com Cc: hamohammed.sa@gmail.com, simona@ffwll.ch, melissa.srw@gmail.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?utf-8?b?Sm9zw6kgRXhww7NzaXRv?= Subject: [PATCH v3 08/16] drm/vkms: Allow to configure multiple encoders via configfs Date: Fri, 7 Mar 2025 17:33:45 +0100 Message-ID: <20250307163353.5896-9-jose.exposito89@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250307163353.5896-1-jose.exposito89@gmail.com> References: <20250307163353.5896-1-jose.exposito89@gmail.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Create a default subgroup at /config/vkms/encoders to allow to create as many encoders as required. Co-developed-by: Louis Chauvet Signed-off-by: Louis Chauvet Signed-off-by: José Expósito --- Documentation/gpu/vkms.rst | 6 ++ drivers/gpu/drm/vkms/vkms_configfs.c | 87 ++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+) diff --git a/Documentation/gpu/vkms.rst b/Documentation/gpu/vkms.rst index 13b96837a266..e24767448775 100644 --- a/Documentation/gpu/vkms.rst +++ b/Documentation/gpu/vkms.rst @@ -76,6 +76,7 @@ And directories are created for each configurable item of the display pipeline:: tree /config/vkms/my-vkms ├── crtcs ├── enabled + ├── encoders └── planes To add items to the display pipeline, create one or more directories under the @@ -98,6 +99,10 @@ CRTCs have 1 configurable attribute: - writeback: Enable or disable writeback connector support by writing 1 or 0 +Next, create one or more encoders:: + + sudo mkdir /config/vkms/my-vkms/encoders/encoder0 + To finish the configuration, link the different pipeline items:: sudo ln -s /config/vkms/my-vkms/crtcs/crtc0 /config/vkms/my-vkms/planes/plane0/possible_crtcs @@ -119,6 +124,7 @@ And removing the top level directory and its subdirectories:: sudo rm /config/vkms/my-vkms/planes/*/possible_crtcs/* sudo rmdir /config/vkms/my-vkms/planes/* sudo rmdir /config/vkms/my-vkms/crtcs/* + sudo rmdir /config/vkms/my-vkms/encoders/* sudo rmdir /config/vkms/my-vkms Testing With IGT diff --git a/drivers/gpu/drm/vkms/vkms_configfs.c b/drivers/gpu/drm/vkms/vkms_configfs.c index 2cf97c2b6203..0df86e63570a 100644 --- a/drivers/gpu/drm/vkms/vkms_configfs.c +++ b/drivers/gpu/drm/vkms/vkms_configfs.c @@ -18,6 +18,7 @@ static bool is_configfs_registered; * Initialized when a new directory is created under "/config/vkms/" * @planes_group: Default subgroup of @group at "/config/vkms/planes" * @crtcs_group: Default subgroup of @group at "/config/vkms/crtcs" + * @encoders_group: Default subgroup of @group at "/config/vkms/encoders" * @lock: Lock used to project concurrent access to the configuration attributes * @config: Protected by @lock. Configuration of the VKMS device * @enabled: Protected by @lock. The device is created or destroyed when this @@ -27,6 +28,7 @@ struct vkms_configfs_device { struct config_group group; struct config_group planes_group; struct config_group crtcs_group; + struct config_group encoders_group; struct mutex lock; struct vkms_config *config; @@ -63,6 +65,20 @@ struct vkms_configfs_crtc { struct vkms_config_crtc *config; }; +/** + * struct vkms_configfs_encoder - Configfs representation of a encoder + * + * @group: Top level configuration group that represents a encoder. + * Initialized when a new directory is created under "/config/vkms/encoders" + * @dev: The vkms_configfs_device this encoder belongs to + * @config: Configuration of the VKMS encoder + */ +struct vkms_configfs_encoder { + struct config_group group; + struct vkms_configfs_device *dev; + struct vkms_config_encoder *config; +}; + #define device_item_to_vkms_configfs_device(item) \ container_of(to_config_group((item)), struct vkms_configfs_device, \ group) @@ -80,6 +96,10 @@ struct vkms_configfs_crtc { #define crtc_item_to_vkms_configfs_crtc(item) \ container_of(to_config_group((item)), struct vkms_configfs_crtc, group) +#define encoder_item_to_vkms_configfs_encoder(item) \ + container_of(to_config_group((item)), struct vkms_configfs_encoder, \ + group) + static ssize_t crtc_writeback_show(struct config_item *item, char *page) { struct vkms_configfs_crtc *crtc; @@ -344,6 +364,69 @@ static const struct config_item_type plane_group_type = { .ct_owner = THIS_MODULE, }; +static void encoder_release(struct config_item *item) +{ + struct vkms_configfs_encoder *encoder; + struct mutex *lock; + + encoder = encoder_item_to_vkms_configfs_encoder(item); + lock = &encoder->dev->lock; + + scoped_guard(mutex, lock) { + vkms_config_destroy_encoder(encoder->dev->config, encoder->config); + kfree(encoder); + } +} + +static struct configfs_item_operations encoder_item_operations = { + .release = &encoder_release, +}; + +static const struct config_item_type encoder_item_type = { + .ct_item_ops = &encoder_item_operations, + .ct_owner = THIS_MODULE, +}; + +static struct config_group *make_encoder_group(struct config_group *group, + const char *name) +{ + struct vkms_configfs_device *dev; + struct vkms_configfs_encoder *encoder; + + dev = child_group_to_vkms_configfs_device(group); + + scoped_guard(mutex, &dev->lock) { + if (dev->enabled) + return ERR_PTR(-EBUSY); + + encoder = kzalloc(sizeof(*encoder), GFP_KERNEL); + if (!encoder) + return ERR_PTR(-ENOMEM); + + encoder->dev = dev; + + encoder->config = vkms_config_create_encoder(dev->config); + if (IS_ERR(encoder->config)) { + kfree(encoder); + return ERR_CAST(encoder->config); + } + + config_group_init_type_name(&encoder->group, name, + &encoder_item_type); + } + + return &encoder->group; +} + +static struct configfs_group_operations encoders_group_operations = { + .make_group = &make_encoder_group, +}; + +static const struct config_item_type encoder_group_type = { + .ct_group_ops = &encoders_group_operations, + .ct_owner = THIS_MODULE, +}; + static ssize_t device_enabled_show(struct config_item *item, char *page) { struct vkms_configfs_device *dev; @@ -447,6 +530,10 @@ static struct config_group *make_device_group(struct config_group *group, &crtc_group_type); configfs_add_default_group(&dev->crtcs_group, &dev->group); + config_group_init_type_name(&dev->encoders_group, "encoders", + &encoder_group_type); + configfs_add_default_group(&dev->encoders_group, &dev->group); + return &dev->group; }