From nobody Sun Feb 8 17:42:47 2026 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 6901619AD85 for ; Tue, 13 Aug 2024 10:51:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723546318; cv=none; b=VWnuz3ixymnwT4Cg4Iuz6DmlNtBHo+JhXQ63wem+cXSX1GGOf2YXb5/4NA120MEJIyINSO0JAPsTZKNr/ssHrUqu6zKTo9jzgiw3mmPczwtRDW4fRabdyRePC0AT+nd3cNohwmSmANhxQMQJ0si/rvbyKju5JOzOHTlW4Rn3PDk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723546318; c=relaxed/simple; bh=g+Fb6g0AqYVQz0d1phWG6a23pwAL4co6gMWTvCwErmI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gBVaNBK/XcYMSN5JyNd3A7DxotoaIDEWeFht48FURczSBcgUlcyzvcUmK0Nn48E/9W3dbpyjMdU7NglQLc/hp/vZmCKYrnUXYczNAsQufzAALOuY47mwQPJPBmYcrBDCWmduyJZvurPeptzB9G8i8qyLQTQGcG+29xLQoJ9gY2s= 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=DjZfRuHS; arc=none smtp.client-ip=209.85.128.51 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="DjZfRuHS" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4280ee5f1e3so40484115e9.0 for ; Tue, 13 Aug 2024 03:51:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723546315; x=1724151115; 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=F/G5AnsYa7zmUTR/MiH01m+WsCKhEwrbdAUk5c5JpIU=; b=DjZfRuHS53OBarTrPuz7ZfswpfeGmGf6IS6Z3z2ZdDe63pxm9YsGENtEXKd/X0EuNq NOtCI5sC/WcQFEwyJvP11kLv9Z/O8YQ2lfBeQawFRyExl8BLE0utflcYTWzbHGDrpHj0 NmzW49fqappy1/SH3hTQFpBX49IWJsjRV8NuRT0mNu/wbZWm2XAO+Xoeq4STz0b/loZ4 ZzLQpOg+xHOvCDkFV5Urm4+YQvd8x+bhiZkdRO1VCYIpHdzQ6Oa9hsjSOcWf2pwZp0mu VpsSENbquu4w2V/WJyN/3j2lDDS6XbUlcjEOhw557RGcQaml/iMeGJojObl8F4T7R4mQ NPtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723546315; x=1724151115; 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=F/G5AnsYa7zmUTR/MiH01m+WsCKhEwrbdAUk5c5JpIU=; b=NRSlEhsszfUnkFCZSjF4N8qOuMxCwohQOSNa7y9HxUuV60BL7BWoG9l7xmqyZXngEi PRNNb7N2Xanvjz90gF4Nm2vmQKsaFfqUs+yUXIcziHH64YjxS5FImapCSB3Y0YikG8aG FclIcUrTNJertFjGg6chBJnpXqQ+AsfyvDR3Rd3Ur1eRrTqjs+Wk0FeC03hpsuJUIkr/ vvV+M2HRbg2BDUxAgUtodWZqNSUZRtVgII+psKQAPmZ5srlcrvGq++OLeTIyEUnPTzJb i0USMWtzkbMqNqbmgEHE1Bi0OoTBE6fObI5g5CAbTq3NUmjZxh6Ksfi10VPWolmwBC48 Mp3w== X-Forwarded-Encrypted: i=1; AJvYcCUPhpIKDFyC75tUwg59kYKnJuKADAXFfFgc8WkYgO5b5PeHdmKpC7FN6CbNfYbsil6USNvs7+4YvVprT139VegQ+ik924QpIZvRYNlx X-Gm-Message-State: AOJu0YzOGAgfI6Q7vbPAbw5gT4rPkZqbOJfxOGIfLQS9RqWtlnq4iCzG 28/lRdu5681io3oLttVYLbzG85qxU6dLnUO+R5hDEUPN9dnyEAJzDiO3RJox X-Google-Smtp-Source: AGHT+IH8LR+1P5qUwpzWamxktmdZ24m1L+TeHAheXbr8p/lSB6gOBODyUIlICFjkqU13hylsNNiByA== X-Received: by 2002:a05:600c:450e:b0:425:7796:8e2c with SMTP id 5b1f17b1804b1-429d4805ac3mr20794595e9.12.1723546314557; Tue, 13 Aug 2024 03:51:54 -0700 (PDT) Received: from fedora.. ([213.94.26.172]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-429d877e066sm17290785e9.1.2024.08.13.03.51.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 03:51:53 -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 13/17] drm/vkms: Allow to configure multiple encoders via configfs Date: Tue, 13 Aug 2024 12:44:24 +0200 Message-ID: <20240813105134.17439-14-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 Create a default subgroup at /config/vkms/encoders to allow to create as many encoders as required. When the encoder is created the possible_crtcs subgroup is created allowing to link encoders and CRTCs. Signed-off-by: Jos=C3=A9 Exp=C3=B3sito --- Documentation/gpu/vkms.rst | 14 ++- drivers/gpu/drm/vkms/vkms_config.h | 3 + drivers/gpu/drm/vkms/vkms_configfs.c | 127 +++++++++++++++++++++++++-- 3 files changed, 136 insertions(+), 8 deletions(-) diff --git a/Documentation/gpu/vkms.rst b/Documentation/gpu/vkms.rst index 0886349ad4a0..c69be063d3b4 100644 --- a/Documentation/gpu/vkms.rst +++ b/Documentation/gpu/vkms.rst @@ -76,7 +76,8 @@ And directories are created for each configurable item of= the display pipeline:: tree /config/vkms/my-vkms /config/vkms/my-vkms =E2=94=9C=E2=94=80=E2=94=80 crtcs - =E2=94=94=E2=94=80=E2=94=80 enabled + =E2=94=9C=E2=94=80=E2=94=80 enabled + =E2=94=94=E2=94=80=E2=94=80 encoders =20 To add items to the display pipeline, create one or more directories under= the available paths. @@ -90,6 +91,15 @@ CRTCs have 2 configurable attributes: - cursor: Enable or disable cursor plane support - writeback: Enable or disable writeback connector support =20 +Continue by creating one or more encoders:: + + sudo mkdir /config/vkms/my-vkms/encoders/encoder0 + +Encoders can be linked to CRTCs by creating a symbolic link under +``possible_crtcs``:: + + sudo ln -s /config/vkms/my-vkms/crtcs/crtc0 /config/vkms/my-vkms/encoder= s/encoder0/possible_crtcs + Once you are done configuring the VKMS instance, enable it:: =20 echo "1" | sudo tee /config/vkms/my-vkms/enabled @@ -100,6 +110,8 @@ Finally, you can remove the VKMS instance disabling it:: =20 Or removing the top level directory and its subdirectories:: =20 + sudo rm /config/vkms/my-vkms/encoders/*/possible_crtcs/* + sudo rmdir /config/vkms/my-vkms/encoders/* sudo rmdir /config/vkms/my-vkms/crtcs/* sudo rmdir /config/vkms/my-vkms =20 diff --git a/drivers/gpu/drm/vkms/vkms_config.h b/drivers/gpu/drm/vkms/vkms= _config.h index f96a0456a3d7..f9423533a7f3 100644 --- a/drivers/gpu/drm/vkms/vkms_config.h +++ b/drivers/gpu/drm/vkms/vkms_config.h @@ -29,6 +29,9 @@ struct vkms_config_encoder { struct list_head list; unsigned int index; uint32_t possible_crtcs; + /* only used if created from configfs */ + struct config_group encoder_group; + struct config_group possible_crtcs_group; }; =20 struct vkms_config_connector { diff --git a/drivers/gpu/drm/vkms/vkms_configfs.c b/drivers/gpu/drm/vkms/vk= ms_configfs.c index 04278a39cd3c..c0b62fb93dc0 100644 --- a/drivers/gpu/drm/vkms/vkms_configfs.c +++ b/drivers/gpu/drm/vkms/vkms_configfs.c @@ -19,6 +19,8 @@ static bool is_configfs_registered; * Initialized when a new directory is created under "/config/vkms/" * @crtcs_group: Default subgroup of @device_group at "/config/vkms/crtcs". * 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 * @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 @@ -27,6 +29,7 @@ struct vkms_configfs { struct vkms_config *vkms_config; struct config_group device_group; struct config_group crtcs_group; + struct config_group encoders_group; =20 /* protected by @lock */ struct mutex lock; @@ -45,6 +48,15 @@ struct vkms_configfs { #define crtcs_item_to_vkms_config_crtc(item) \ container_of(to_config_group(item), struct vkms_config_crtc, crtc_group) =20 +#define encoders_group_to_vkms_configfs(group) \ + container_of(group, struct vkms_configfs, encoders_group) + +#define encoders_item_to_vkms_config_encoder(item) \ + container_of(to_config_group(item), struct vkms_config_encoder, encoder_g= roup) + +#define encoder_possible_crtcs_item_to_vkms_config_encoder(item) \ + container_of(to_config_group(item), struct vkms_config_encoder, possible_= crtcs_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= ); @@ -171,6 +183,110 @@ static struct config_item_type crtcs_group_type =3D { .ct_owner =3D THIS_MODULE, }; =20 +static int encoder_possible_crtcs_allow_link(struct config_item *src, + struct config_item *target) +{ + struct vkms_config_encoder *encoder_cfg; + struct vkms_config_crtc *crtc_cfg; + + if (target->ci_type !=3D &crtc_group_type) + return -EINVAL; + + encoder_cfg =3D encoder_possible_crtcs_item_to_vkms_config_encoder(src); + crtc_cfg =3D crtcs_item_to_vkms_config_crtc(target); + + if (encoder_cfg->possible_crtcs & BIT(crtc_cfg->index)) + return -EINVAL; + + encoder_cfg->possible_crtcs |=3D BIT(crtc_cfg->index); + + return 0; +} + +static void encoder_possible_crtcs_drop_link(struct config_item *src, + struct config_item *target) +{ + struct vkms_config_encoder *encoder_cfg; + struct vkms_config_crtc *crtc_cfg; + + encoder_cfg =3D encoder_possible_crtcs_item_to_vkms_config_encoder(src); + crtc_cfg =3D crtcs_item_to_vkms_config_crtc(target); + + encoder_cfg->possible_crtcs &=3D ~BIT(crtc_cfg->index); +} + +static struct configfs_item_operations encoder_possible_crtcs_item_ops =3D= { + .allow_link =3D &encoder_possible_crtcs_allow_link, + .drop_link =3D &encoder_possible_crtcs_drop_link, +}; + +static struct config_item_type encoder_possible_crtcs_group_type =3D { + .ct_item_ops =3D &encoder_possible_crtcs_item_ops, + .ct_owner =3D THIS_MODULE, +}; + +static const struct config_item_type encoder_group_type =3D { + .ct_owner =3D THIS_MODULE, +}; + +static struct config_group *make_encoders_group(struct config_group *group, + const char *name) +{ + struct vkms_configfs *configfs =3D encoders_group_to_vkms_configfs(group); + struct vkms_config_encoder *encoder_cfg; + int ret; + + mutex_lock(&configfs->lock); + + if (configfs->enabled) { + ret =3D -EINVAL; + goto err_unlock; + } + + encoder_cfg =3D vkms_config_add_encoder(configfs->vkms_config, 0); + if (IS_ERR(encoder_cfg)) { + ret =3D PTR_ERR(encoder_cfg); + goto err_unlock; + } + + config_group_init_type_name(&encoder_cfg->encoder_group, name, + &encoder_group_type); + + config_group_init_type_name(&encoder_cfg->possible_crtcs_group, + "possible_crtcs", + &encoder_possible_crtcs_group_type); + configfs_add_default_group(&encoder_cfg->possible_crtcs_group, + &encoder_cfg->encoder_group); + + mutex_unlock(&configfs->lock); + + return &encoder_cfg->encoder_group; + +err_unlock: + mutex_unlock(&configfs->lock); + return ERR_PTR(ret); +} + +static void drop_encoders_group(struct config_group *group, + struct config_item *item) +{ + struct vkms_configfs *configfs =3D encoders_group_to_vkms_configfs(group); + struct vkms_config_encoder *encoder_cfg =3D + encoders_item_to_vkms_config_encoder(item); + + vkms_config_destroy_encoder(configfs->vkms_config, encoder_cfg); +} + +static struct configfs_group_operations encoders_group_ops =3D { + .make_group =3D &make_encoders_group, + .drop_item =3D &drop_encoders_group, +}; + +static struct config_item_type encoders_group_type =3D { + .ct_group_ops =3D &encoders_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); @@ -225,7 +341,6 @@ static struct config_group *make_device_group(struct co= nfig_group *group, const char *name) { struct vkms_configfs *configfs; - struct vkms_config_encoder *encoder_cfg =3D NULL; struct vkms_config_connector *connector_cfg =3D NULL; char *config_name; int ret; @@ -252,11 +367,10 @@ static struct config_group *make_device_group(struct = config_group *group, configfs_add_default_group(&configfs->crtcs_group, &configfs->device_group); =20 - encoder_cfg =3D vkms_config_add_encoder(configfs->vkms_config, BIT(0)); - if (IS_ERR(encoder_cfg)) { - ret =3D PTR_ERR(encoder_cfg); - goto err_kfree; - } + config_group_init_type_name(&configfs->encoders_group, "encoders", + &encoders_group_type); + 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); @@ -269,7 +383,6 @@ static struct config_group *make_device_group(struct co= nfig_group *group, =20 err_kfree: kfree(configfs); - kfree(encoder_cfg); kfree(connector_cfg); return ERR_PTR(ret); } --=20 2.46.0