From patchwork Fri Mar 7 16:33:40 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: 14006736 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 04E57C19F32 for ; Fri, 7 Mar 2025 16:34:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 63EB810E0F4; Fri, 7 Mar 2025 16:34:06 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MfWlweHE"; dkim-atps=neutral Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5D0AC10E1A3 for ; Fri, 7 Mar 2025 16:34:03 +0000 (UTC) Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-38f406e9f80so1521502f8f.2 for ; Fri, 07 Mar 2025 08:34:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741365242; x=1741970042; 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=gYVCtKALM7tRTxTIBs5CBqjqnZ0ufRMiomzRADReB1Y=; b=MfWlweHEYca+R8nbaw19DCqc3menFmqGXq9fTIK1I+5KwOt8YhsYgb0dr+yJIkAxl3 hlqGRnzLkmDV3GSvx7r+HqzxsagUtT8v6CjATl+zxqQCPI5OguCoz/WAXMWTAhNj+W+w AxnFy5PK2vHwWs8XZMaKLKfshtBzh6yHtfJ7n94jt00WI+YfDrDTwOXplfkzd++TlViZ a5eO8ZRLmZfNPDlSKFdevgBSuPOgrfFbAUlmdUlvtX8LUbEFA5zKlkQCgcziMF/UVCf7 mW2oUax3gr42cFgdYIk0/f88nwiHoWzXJoH9VxhuyaWXGLMdaHqaTZ/CqjXsXmpWT4iI xNng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741365242; x=1741970042; 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=gYVCtKALM7tRTxTIBs5CBqjqnZ0ufRMiomzRADReB1Y=; b=qUDApR8vrQMVYpLA1B3GdrRoCVTaF0Fl2EwkZGgN0XxZV9rr+PkuzVCBdJ/erOZo4j tMMgZLWW+k0aQemBi5MmE2ZZQVSqd0DBfEFZ4iP4MwhNpjnC0pmblNQ8xfejFP82hoY1 ZjaPjvS99hVx1ejNAe60SiyRD+eBhnoj5fYf80WwoDO5H4V1wn0+Kv525ei+TlQ/ph/+ 4n6AbfPfGv+fCwL6dcrJgxvfFpQ95GyRIk4teA0wk8Z4HsFR/BVpqcuVba0GbicVt0y5 z6uzebarFKkt21XW+aH8jpXGiwcPINY/ix9rl3UrmClxJfmhE3c+FByWEvk82lA67XcO Mrrg== X-Forwarded-Encrypted: i=1; AJvYcCWxu6OK7PcsAWu7MfJp/HZ9oYJzrpjoGYRZdC06W2uCFfLayn3rada75gOXg56FTXIx5R/DIZx3JjY=@lists.freedesktop.org X-Gm-Message-State: AOJu0YxtS6sJWadHHflZyIUtMHrxfsbN1GpBMUHonc50m+P5aquhzmzm gdbZ2ByO/F3mDC2o7cYMsnYlRADR5XQXRiREBbsM98fYxQv10731 X-Gm-Gg: ASbGncseUzmAMz2xEJ0vMg5m/z93A2lTvOb6nW5lWMXBG8tNpsSMvxl4MOjOPLZKZIW mfnpeujvOrchRNVjUQiVhzAyAVvFQQvTm+0rY5X51DKS2p65U2+WD7LpJZHDG1M7oK6qe2WW6Zy qn/IoZtm7q0ZT2v5NI2rW/YJ3D+fVlMVkaoaYxURst4CwMNPSQxqMohhpp9PiUhBhsVhWzet5/v y2DmR7YMhraB4WTgCvtKqE43+Snf1eSuZEsS33XkOj7h+Pax30KZiMvY3+kGz8eKQg8RsBCtQt9 ukHLbUvYYPKtrNwteW68zioEK/nez/3J+9pF0NNrjZWzFR4= X-Google-Smtp-Source: AGHT+IHUuKO6qRQ3oA5vpJ7m+Un5BJ2C/6O9k5CT+//v2AYCHfRgiVqmxqLuZIOxa0Icg/nj8Yx3UQ== X-Received: by 2002:a05:6000:1867:b0:390:f9f9:3e9c with SMTP id ffacd0b85a97d-39132d7a804mr2826550f8f.25.1741365241768; Fri, 07 Mar 2025 08:34:01 -0800 (PST) Received: from fedora.. ([213.94.27.232]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c019557sm6031436f8f.50.2025.03.07.08.34.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Mar 2025 08:34:01 -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 03/16] drm/vkms: Allow to configure multiple planes via configfs Date: Fri, 7 Mar 2025 17:33:40 +0100 Message-ID: <20250307163353.5896-4-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/planes to allow to create as many planes as required. Reviewed-by: Louis Chauvet Co-developed-by: Louis Chauvet Signed-off-by: Louis Chauvet 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 423bdf86b5b1..bf23d0da33fe 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; }