Skip to content

Commit 64229b8

Browse files
Fomyslucaceresoli
authored andcommitted
drm/vkms: Allow to attach connectors and encoders via configfs
Create a default subgroup at /config/vkms/connectors/connector/possible_encoders that will contain symbolic links to the possible encoders for the connector. Tested-by: Mark Yacoub <markyacoub@google.com> Reviewed-by: Louis Chauvet <louis.chauvet@bootlin.com> Reviewed-by: Harry Wentland <harry.wentland@amd.com> Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com> Co-developed-by: José Expósito <jose.exposito89@gmail.com> Signed-off-by: José Expósito <jose.exposito89@gmail.com> Link: https://lore.kernel.org/r/20251016175618.10051-12-jose.exposito89@gmail.com Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
1 parent 272acbc commit 64229b8

2 files changed

Lines changed: 64 additions & 0 deletions

File tree

Documentation/gpu/vkms.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ To finish the configuration, link the different pipeline items::
112112

113113
sudo ln -s /config/vkms/my-vkms/crtcs/crtc0 /config/vkms/my-vkms/planes/plane0/possible_crtcs
114114
sudo ln -s /config/vkms/my-vkms/crtcs/crtc0 /config/vkms/my-vkms/encoders/encoder0/possible_crtcs
115+
sudo ln -s /config/vkms/my-vkms/encoders/encoder0 /config/vkms/my-vkms/connectors/connector0/possible_encoders
115116

116117
Since at least one primary plane is required, make sure to set the right type::
117118

@@ -129,6 +130,7 @@ And removing the top level directory and its subdirectories::
129130

130131
sudo rm /config/vkms/my-vkms/planes/*/possible_crtcs/*
131132
sudo rm /config/vkms/my-vkms/encoders/*/possible_crtcs/*
133+
sudo rm /config/vkms/my-vkms/connectors/*/possible_encoders/*
132134
sudo rmdir /config/vkms/my-vkms/planes/*
133135
sudo rmdir /config/vkms/my-vkms/crtcs/*
134136
sudo rmdir /config/vkms/my-vkms/encoders/*

drivers/gpu/drm/vkms/vkms_configfs.c

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,14 @@ struct vkms_configfs_encoder {
8888
*
8989
* @group: Top level configuration group that represents a connector.
9090
* Initialized when a new directory is created under "/config/vkms/connectors"
91+
* @possible_encoders_group: Default subgroup of @group at
92+
* "connector/possible_encoders"
9193
* @dev: The vkms_configfs_device this connector belongs to
9294
* @config: Configuration of the VKMS connector
9395
*/
9496
struct vkms_configfs_connector {
9597
struct config_group group;
98+
struct config_group possible_encoders_group;
9699
struct vkms_configfs_device *dev;
97100
struct vkms_config_connector *config;
98101
};
@@ -126,6 +129,10 @@ struct vkms_configfs_connector {
126129
container_of(to_config_group((item)), struct vkms_configfs_connector, \
127130
group)
128131

132+
#define connector_possible_encoders_item_to_vkms_configfs_connector(item) \
133+
container_of(to_config_group((item)), struct vkms_configfs_connector, \
134+
possible_encoders_group)
135+
129136
static ssize_t crtc_writeback_show(struct config_item *item, char *page)
130137
{
131138
struct vkms_configfs_crtc *crtc;
@@ -528,6 +535,55 @@ static const struct config_item_type connector_item_type = {
528535
.ct_owner = THIS_MODULE,
529536
};
530537

538+
static int connector_possible_encoders_allow_link(struct config_item *src,
539+
struct config_item *target)
540+
{
541+
struct vkms_configfs_connector *connector;
542+
struct vkms_configfs_encoder *encoder;
543+
int ret;
544+
545+
if (target->ci_type != &encoder_item_type)
546+
return -EINVAL;
547+
548+
connector = connector_possible_encoders_item_to_vkms_configfs_connector(src);
549+
encoder = encoder_item_to_vkms_configfs_encoder(target);
550+
551+
scoped_guard(mutex, &connector->dev->lock) {
552+
if (connector->dev->enabled)
553+
return -EBUSY;
554+
555+
ret = vkms_config_connector_attach_encoder(connector->config,
556+
encoder->config);
557+
}
558+
559+
return ret;
560+
}
561+
562+
static void connector_possible_encoders_drop_link(struct config_item *src,
563+
struct config_item *target)
564+
{
565+
struct vkms_configfs_connector *connector;
566+
struct vkms_configfs_encoder *encoder;
567+
568+
connector = connector_possible_encoders_item_to_vkms_configfs_connector(src);
569+
encoder = encoder_item_to_vkms_configfs_encoder(target);
570+
571+
scoped_guard(mutex, &connector->dev->lock) {
572+
vkms_config_connector_detach_encoder(connector->config,
573+
encoder->config);
574+
}
575+
}
576+
577+
static struct configfs_item_operations connector_possible_encoders_item_operations = {
578+
.allow_link = connector_possible_encoders_allow_link,
579+
.drop_link = connector_possible_encoders_drop_link,
580+
};
581+
582+
static const struct config_item_type connector_possible_encoders_group_type = {
583+
.ct_item_ops = &connector_possible_encoders_item_operations,
584+
.ct_owner = THIS_MODULE,
585+
};
586+
531587
static struct config_group *make_connector_group(struct config_group *group,
532588
const char *name)
533589
{
@@ -554,6 +610,12 @@ static struct config_group *make_connector_group(struct config_group *group,
554610

555611
config_group_init_type_name(&connector->group, name,
556612
&connector_item_type);
613+
614+
config_group_init_type_name(&connector->possible_encoders_group,
615+
"possible_encoders",
616+
&connector_possible_encoders_group_type);
617+
configfs_add_default_group(&connector->possible_encoders_group,
618+
&connector->group);
557619
}
558620

559621
return &connector->group;

0 commit comments

Comments
 (0)