From mboxrd@z Thu Jan 1 00:00:00 1970 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 8AA26CA1005 for ; Mon, 1 Sep 2025 12:26:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BFA8810E439; Mon, 1 Sep 2025 12:25:59 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FBfI876x"; dkim-atps=neutral Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by gabe.freedesktop.org (Postfix) with ESMTPS id A7F3910E43A for ; Mon, 1 Sep 2025 12:25:58 +0000 (UTC) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-45b7c01a8c1so33761185e9.2 for ; Mon, 01 Sep 2025 05:25:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756729557; x=1757334357; 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=s6J822DCG0Tagx+YMQrYzj9nyMAeQiPi53HWBRRFDX8=; b=FBfI876xBVYRh+N/bhS9NmjZ6NR9z6V4HFFhBsmuAFEn3g7+elrbaGmYS+DM0IQdP8 svKIFlfjeDcXu+hZ2ym0ZKCeCHzCsgg2cfCRnQeqvKkEmmaranTGhTqCtnslnyrLLeu/ oWSJ1FeYrxJN41cEFCyZ/s7wkDijqUSFKFpf6gAK4gZxO40gRE1mn/Va8Xae9tb1f+PM 4dsKAkgw9TrF0krxu1tTbaXxvNdPTRkASUJwl0fJ0kmOaR3wOVDYxE+sUjqLBGxjzeXR GuqD5V7HedEpLMV20lNPMyoPlE7Z+70QjEr8lBdUcPTx4+1iCLvqFM8h/BkJSuxFPJh8 wk7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756729557; x=1757334357; 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=s6J822DCG0Tagx+YMQrYzj9nyMAeQiPi53HWBRRFDX8=; b=tTFhKTC3DEt9HKtoTyJ9g6cnsh0cUw3KE3QOTTXvDT+CxwRuui00MRtazMrPDc3VBW Usutq62R4M9gfBS0QuQzAzFBbPmtgNIAJZ1nO4z381IknnsmfxCpR+bo5pSGvhNLMyqs TpwTQG+F1/fLDP+ZLyaorI/aOzDRjgBmTg3uk+vaonwvnBXCguBsN+RH+4CKvR8nEqYa 6RHNHPABXiXFFV7HLQcMG/XjXvKzJY7QypPy4XP5dzGvvydklvylUyizOaRMZj0S9HUZ R01Q4R4DU+ZgxQ3eC8mGStrSYT0MoFLiRDl0+R78OLJneArwLxSeg2krNFw+DC+6xUaJ e7cA== X-Forwarded-Encrypted: i=1; AJvYcCXNd1X0uBhnOgG8DGwUqtyMDE3mtAKXrB7bZwQYW7LfWv4JLpFog/BhLSqAmP+lmtZGd5FviUsJZOY=@lists.freedesktop.org X-Gm-Message-State: AOJu0YxAMuJrmJjdj3ai82bE03BE5qLUzq0FLMPnxTu3u+zHgvMcYmeZ HaTz+355AGFSdim+RmJwrjj4u9PkhAcLHYZY046cnLR3g03Tntfp633P X-Gm-Gg: ASbGncsgD5vivF7fjdwUbMP02RVxxLCar+dX0MzS+SR5EgkahqtQLD6ySZn3Ky7B3g4 kJ0MLA4UsGrALAr9W1LiiTPZV6ZahONoLcNg1PVgLc5VXEW9MXKiuQsnE1UU5D2FlhqEM4C+Y9T 7/MHHKUGiPoSaYGYUsXYJngkPiUMV2k5w/TeaZ3fg3AlDQapxwoGbRsSQ4OJ6yxaXMgUMcN+aan EWg0zKEKWO/ISnR8tkczhu1vWJ+crG9jY6XRmdhm5LQnimn5hrgNIFer0n4DpqQPIvSN5+g9k1F zHIlbWJtPoTZhAv8DBcxyoZSzV4sr70vxniB1vqK/3+JtDYCIMI4VWw9fI+HK4OaRaH5ejLnaHv 6fvXdxQkEO+2GWpk3EeBsJdhXvkjI X-Google-Smtp-Source: AGHT+IFrYs0xdumtDpy/wbHYYgQBN8SFLjE3tN0WJJPP30ut3Q3K4yClWwur8tCR8k25h5oQDUgrRg== X-Received: by 2002:a05:600c:a41:b0:45b:627a:60cf with SMTP id 5b1f17b1804b1-45b8559b8edmr77708035e9.24.1756729557000; Mon, 01 Sep 2025 05:25:57 -0700 (PDT) Received: from fedora ([94.73.32.0]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b74950639sm207297055e9.17.2025.09.01.05.25.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Sep 2025 05:25:56 -0700 (PDT) From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= 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, sebastian.wick@redhat.com, xaver.hugl@kde.org, victoria@system76.com, a.hindborg@kernel.org, leitao@debian.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Mark Yacoub , =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Subject: [PATCH v6 03/16] drm/vkms: Allow to configure multiple planes via configfs Date: Mon, 1 Sep 2025 14:25:28 +0200 Message-ID: <20250901122541.9983-4-jose.exposito89@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250901122541.9983-1-jose.exposito89@gmail.com> References: <20250901122541.9983-1-jose.exposito89@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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" From: Louis Chauvet Create a default subgroup at /config/vkms/planes to allow to create as many planes as required. Tested-by: Mark Yacoub Reviewed-by: Louis Chauvet Signed-off-by: Louis Chauvet Co-developed-by: José Expósito Signed-off-by: José Expósito --- Documentation/gpu/vkms.rst | 16 ++++- drivers/gpu/drm/vkms/vkms_configfs.c | 88 ++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 1 deletion(-) diff --git a/Documentation/gpu/vkms.rst b/Documentation/gpu/vkms.rst index 73521b9ff0c3..c0c892e4e27c 100644 --- a/Documentation/gpu/vkms.rst +++ b/Documentation/gpu/vkms.rst @@ -71,6 +71,19 @@ By default, the instance is disabled:: cat /config/vkms/my-vkms/enabled 0 +And directories are created for each configurable item of the display pipeline:: + + tree /config/vkms/my-vkms + ├── enabled + └── planes + +To add items to the display pipeline, create one or more directories under the +available paths. + +Start by creating one or more planes:: + + sudo mkdir /config/vkms/my-vkms/planes/plane0 + Once you are done configuring the VKMS instance, enable it:: echo "1" | sudo tee /config/vkms/my-vkms/enabled @@ -79,8 +92,9 @@ Finally, you can remove the VKMS instance disabling it:: echo "0" | sudo tee /config/vkms/my-vkms/enabled -And removing the top level directory:: +And removing the top level directory and its subdirectories:: + sudo rmdir /config/vkms/my-vkms/planes/* 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 ee186952971b..a7c705e00e4c 100644 --- a/drivers/gpu/drm/vkms/vkms_configfs.c +++ b/drivers/gpu/drm/vkms/vkms_configfs.c @@ -16,6 +16,7 @@ static bool is_configfs_registered; * * @group: Top level configuration group that represents a VKMS device. * Initialized when a new directory is created under "/config/vkms/" + * @planes_group: Default subgroup of @group at "/config/vkms/planes" * @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 @@ -23,16 +24,99 @@ static bool is_configfs_registered; */ struct vkms_configfs_device { struct config_group group; + struct config_group planes_group; struct mutex lock; struct vkms_config *config; bool enabled; }; +/** + * struct vkms_configfs_plane - Configfs representation of a plane + * + * @group: Top level configuration group that represents a plane. + * Initialized when a new directory is created under "/config/vkms/planes" + * @dev: The vkms_configfs_device this plane belongs to + * @config: Configuration of the VKMS plane + */ +struct vkms_configfs_plane { + struct config_group group; + struct vkms_configfs_device *dev; + struct vkms_config_plane *config; +}; + #define device_item_to_vkms_configfs_device(item) \ container_of(to_config_group((item)), struct vkms_configfs_device, \ group) +#define child_group_to_vkms_configfs_device(group) \ + device_item_to_vkms_configfs_device((&(group)->cg_item)->ci_parent) + +#define plane_item_to_vkms_configfs_plane(item) \ + container_of(to_config_group((item)), struct vkms_configfs_plane, group) + +static void plane_release(struct config_item *item) +{ + struct vkms_configfs_plane *plane; + struct mutex *lock; + + plane = plane_item_to_vkms_configfs_plane(item); + lock = &plane->dev->lock; + + scoped_guard(mutex, lock) { + vkms_config_destroy_plane(plane->config); + kfree(plane); + } +} + +static struct configfs_item_operations plane_item_operations = { + .release = &plane_release, +}; + +static const struct config_item_type plane_item_type = { + .ct_item_ops = &plane_item_operations, + .ct_owner = THIS_MODULE, +}; + +static struct config_group *make_plane_group(struct config_group *group, + const char *name) +{ + struct vkms_configfs_device *dev; + struct vkms_configfs_plane *plane; + + dev = child_group_to_vkms_configfs_device(group); + + scoped_guard(mutex, &dev->lock) { + if (dev->enabled) + return ERR_PTR(-EBUSY); + + plane = kzalloc(sizeof(*plane), GFP_KERNEL); + if (!plane) + return ERR_PTR(-ENOMEM); + + plane->dev = dev; + + plane->config = vkms_config_create_plane(dev->config); + if (IS_ERR(plane->config)) { + kfree(plane); + return ERR_CAST(plane->config); + } + + config_group_init_type_name(&plane->group, name, &plane_item_type); + } + + return &plane->group; +} + +static struct configfs_group_operations planes_group_operations = { + .make_group = &make_plane_group, +}; + +static const struct config_item_type plane_group_type = { + .ct_group_ops = &planes_group_operations, + .ct_owner = THIS_MODULE, +}; + static ssize_t device_enabled_show(struct config_item *item, char *page) { struct vkms_configfs_device *dev; @@ -128,6 +212,10 @@ static struct config_group *make_device_group(struct config_group *group, config_group_init_type_name(&dev->group, name, &device_item_type); mutex_init(&dev->lock); + config_group_init_type_name(&dev->planes_group, "planes", + &plane_group_type); + configfs_add_default_group(&dev->planes_group, &dev->group); + return &dev->group; } -- 2.51.0