In order to prepare for dynamic connector configuration, we need to store if a connector is dynamic and if it is enabled.
The two new vkms_config_connector fields will helps for that. Co-developed-by: José Expósito <[email protected]> Signed-off-by: José Expósito <[email protected]> Signed-off-by: Louis Chauvet <[email protected]> --- drivers/gpu/drm/vkms/tests/vkms_config_test.c | 4 ++ drivers/gpu/drm/vkms/vkms_config.c | 6 +++ drivers/gpu/drm/vkms/vkms_config.h | 66 +++++++++++++++++++++++++++ 3 files changed, 76 insertions(+) diff --git a/drivers/gpu/drm/vkms/tests/vkms_config_test.c b/drivers/gpu/drm/vkms/tests/vkms_config_test.c index 531c3b76b58d..b1d95385263f 100644 --- a/drivers/gpu/drm/vkms/tests/vkms_config_test.c +++ b/drivers/gpu/drm/vkms/tests/vkms_config_test.c @@ -207,6 +207,10 @@ static void vkms_config_test_default_config(struct kunit *test) 0); KUNIT_EXPECT_EQ(test, vkms_config_connector_get_edid_enabled(connector_cfg), false); + KUNIT_EXPECT_EQ(test, vkms_config_connector_is_enabled(connector_cfg), + true); + KUNIT_EXPECT_EQ(test, vkms_config_connector_is_dynamic(connector_cfg), + false); } KUNIT_EXPECT_TRUE(test, vkms_config_is_valid(config)); diff --git a/drivers/gpu/drm/vkms/vkms_config.c b/drivers/gpu/drm/vkms/vkms_config.c index 02c0e944adf8..e86173ad61a6 100644 --- a/drivers/gpu/drm/vkms/vkms_config.c +++ b/drivers/gpu/drm/vkms/vkms_config.c @@ -587,6 +587,8 @@ static int vkms_config_show(struct seq_file *m, void *data) vkms_config_for_each_connector(vkmsdev->config, connector_cfg) { seq_puts(m, "connector:\n"); + seq_printf(m, "\t%s\n", + str_enabled_disabled(vkms_config_connector_is_enabled(connector_cfg))); seq_printf(m, "\tstatus=%s\n", drm_get_connector_status_name(vkms_config_connector_get_status(connector_cfg))); seq_printf(m, "\ttype=%s\n", @@ -600,6 +602,8 @@ static int vkms_config_show(struct seq_file *m, void *data) str_enabled_disabled(vkms_config_connector_get_edid_enabled(connector_cfg)), edid_len ); + seq_printf(m, "\tdynamic=%s\n", + str_true_false(vkms_config_connector_is_dynamic(connector_cfg))); } return 0; @@ -907,6 +911,8 @@ struct vkms_config_connector *vkms_config_create_connector(struct vkms_config *c connector_cfg->status = connector_status_connected; vkms_config_connector_set_type(connector_cfg, DRM_MODE_CONNECTOR_VIRTUAL); vkms_config_connector_set_supported_colorspaces(connector_cfg, 0); + vkms_config_connector_set_dynamic(connector_cfg, false); + vkms_config_connector_set_enabled(connector_cfg, true); xa_init_flags(&connector_cfg->possible_encoders, XA_FLAGS_ALLOC); list_add_tail(&connector_cfg->link, &config->connectors); diff --git a/drivers/gpu/drm/vkms/vkms_config.h b/drivers/gpu/drm/vkms/vkms_config.h index 42f5b5edaf1d..a4aa7ad7be71 100644 --- a/drivers/gpu/drm/vkms/vkms_config.h +++ b/drivers/gpu/drm/vkms/vkms_config.h @@ -130,6 +130,8 @@ struct vkms_config_encoder { * @link: Link to the others connector in vkms_config * @type: Store the type of connector using DRM_MODE_CONNECTOR_* values * @config: The vkms_config this connector belongs to + * @dynamic: Store if a connector should be created with drm_connector_dynamic_init + * @enabled: If @dynamic, this means that the correct is currently registered in drm * @status: Status (connected, disconnected...) of the connector * @supported_colorspaces: Bitmask of all the supported colorspaces. Values * are the sames as ones accepted by @@ -149,6 +151,8 @@ struct vkms_config_connector { struct vkms_config *config; int type; + bool enabled; + bool dynamic; enum drm_connector_status status; u32 supported_colorspaces; bool edid_enabled; @@ -192,6 +196,24 @@ struct vkms_config_connector { #define vkms_config_for_each_connector(config, connector_cfg) \ list_for_each_entry((connector_cfg), &(config)->connectors, link) +/** + * vkms_config_for_each_connector_static - Iterate over the static vkms_config connectors + * @config: &struct vkms_config pointer + * @connector_cfg: &struct vkms_config_connector pointer used as cursor + */ +#define vkms_config_for_each_connector_static(config, connector_cfg) \ + vkms_config_for_each_connector((config), (connector_cfg)) \ + if (!(connector_cfg)->dynamic) + +/** + * vkms_config_for_each_connector_dynamic - Iterate over the dynamic vkms_config connectors + * @config: &struct vkms_config pointer + * @connector_cfg: &struct vkms_config_connector pointer used as cursor + */ +#define vkms_config_for_each_connector_dynamic(config, connector_cfg) \ + vkms_config_for_each_connector((config), (connector_cfg)) \ + if ((connector_cfg)->dynamic) + /** * vkms_config_plane_for_each_possible_crtc - Iterate over the vkms_config_plane * possible CRTCs @@ -445,6 +467,50 @@ vkms_config_connector_set_type(struct vkms_config_connector *connector_cfg, connector_cfg->type = type; } +/** + * vkms_config_connector_set_enabled() - If the connector is part of the device + * @crtc_cfg: Target connector + * @enabled: Add or remove the connector + */ +static inline void +vkms_config_connector_set_enabled(struct vkms_config_connector *connector_cfg, + bool enabled) +{ + connector_cfg->enabled = enabled; +} + +/** + * vkms_config_connector_is_enabled() - If the connector is part of the device + * @connector_cfg: The connector + */ +static inline bool +vkms_config_connector_is_enabled(const struct vkms_config_connector *connector_cfg) +{ + return connector_cfg->enabled; +} + +/** + * vkms_config_connector_set_dynamic() - If the connector is dynamic + * @crtc_cfg: Target connector + * @enabled: Enable or disable the dynamic status + */ +static inline void +vkms_config_connector_set_dynamic(struct vkms_config_connector *connector_cfg, + bool dynamic) +{ + connector_cfg->dynamic = dynamic; +} + +/** + * vkms_config_connector_is_enabled() - If the connector is dynamic + * @connector_cfg: The connector + */ +static inline bool +vkms_config_connector_is_dynamic(struct vkms_config_connector *connector_cfg) +{ + return connector_cfg->dynamic; +} + /* * vkms_config_plane_get_default_rotation() - Get the default rotation for a plane * @plane_cfg: Plane to get the default rotation from -- 2.51.0
