[PATCH v6 31/43] drm/vkms: Introduce back pointer to connector
From: Louis Chauvet
Date: Fri Nov 20 2026 - 13:09:22 EST
Each connector now stores a pointer to its vkms_config_connector and
takes a reference on it when created, released through a drmm action on
device cleanup; detect() uses the back-pointer instead of walking the
configuration list.
Signed-off-by: Louis Chauvet <louis.chauvet@xxxxxxxxxxx>
---
drivers/gpu/drm/vkms/vkms_connector.c | 30 +++++++++++++++++++++++-------
drivers/gpu/drm/vkms/vkms_connector.h | 9 ++++++++-
drivers/gpu/drm/vkms/vkms_output.c | 2 +-
3 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/vkms/vkms_connector.c b/drivers/gpu/drm/vkms/vkms_connector.c
index 57138027966f..11e313440225 100644
--- a/drivers/gpu/drm/vkms/vkms_connector.c
+++ b/drivers/gpu/drm/vkms/vkms_connector.c
@@ -11,11 +11,9 @@
static enum drm_connector_status vkms_connector_detect(struct drm_connector *connector,
bool force)
{
- struct drm_device *dev = connector->dev;
- struct vkms_device *vkmsdev = drm_device_to_vkms_device(dev);
struct vkms_connector *vkms_connector;
+ struct vkms_config_connector *cfg;
enum drm_connector_status status;
- struct vkms_config_connector *connector_cfg;
vkms_connector = drm_connector_to_vkms_connector(connector);
@@ -26,9 +24,11 @@ static enum drm_connector_status vkms_connector_detect(struct drm_connector *con
*/
status = connector->status;
- vkms_config_for_each_connector(vkmsdev->config, connector_cfg) {
- if (connector_cfg->connector == vkms_connector)
- status = vkms_config_connector_get_status(connector_cfg);
+ cfg = vkms_connector->cfg;
+ if (cfg) {
+ cfg = vkms_config_connector_get(cfg);
+ status = vkms_config_connector_get_status(cfg);
+ vkms_config_connector_put(cfg);
}
return status;
@@ -68,7 +68,16 @@ static const struct drm_connector_helper_funcs vkms_conn_helper_funcs = {
.best_encoder = vkms_conn_best_encoder,
};
-struct vkms_connector *vkms_connector_init(struct vkms_device *vkmsdev)
+static void vkms_connector_static_cfg_release(struct drm_device *dev, void *res)
+{
+ struct vkms_connector *connector = res;
+
+ vkms_config_connector_put(connector->cfg);
+}
+
+
+struct vkms_connector *vkms_connector_init(struct vkms_device *vkmsdev,
+ struct vkms_config_connector *connector_cfg)
{
struct drm_device *dev = &vkmsdev->drm;
struct vkms_connector *connector;
@@ -85,6 +94,13 @@ struct vkms_connector *vkms_connector_init(struct vkms_device *vkmsdev)
drm_connector_helper_add(&connector->base, &vkms_conn_helper_funcs);
+ connector->cfg = connector_cfg;
+ vkms_config_connector_get(connector_cfg);
+ ret = drmm_add_action_or_reset(dev, vkms_connector_static_cfg_release,
+ connector);
+ if (ret)
+ return ERR_PTR(ret);
+
return connector;
}
diff --git a/drivers/gpu/drm/vkms/vkms_connector.h b/drivers/gpu/drm/vkms/vkms_connector.h
index 52ae97af2bc1..89d7f3a15d6e 100644
--- a/drivers/gpu/drm/vkms/vkms_connector.h
+++ b/drivers/gpu/drm/vkms/vkms_connector.h
@@ -4,6 +4,7 @@
#define _VKMS_CONNECTOR_H_
#include "vkms_drv.h"
+#include "vkms_config.h"
#define drm_connector_to_vkms_connector(target) \
container_of(target, struct vkms_connector, base)
@@ -12,19 +13,25 @@
* struct vkms_connector - VKMS custom type wrapping around the DRM connector
*
* @base: Base DRM connector
+ * @cfg: Configuration of the connector. A reference on it is taken at
+ * creation and released by a drmm action on device cleanup
*/
struct vkms_connector {
struct drm_connector base;
+
+ struct vkms_config_connector *cfg;
};
/**
* vkms_connector_init() - Initialize a connector
* @vkmsdev: VKMS device containing the connector
+ * @connector_cfg: Connector's configuration
*
* Returns:
* The connector or an error on failure.
*/
-struct vkms_connector *vkms_connector_init(struct vkms_device *vkmsdev);
+struct vkms_connector *vkms_connector_init(struct vkms_device *vkmsdev,
+ struct vkms_config_connector *connector_cfg);
/**
* vkms_trigger_connector_hotplug() - Update the device's connectors status
diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
index 982c6cd5fcc7..7783a2f6d343 100644
--- a/drivers/gpu/drm/vkms/vkms_output.c
+++ b/drivers/gpu/drm/vkms/vkms_output.c
@@ -97,7 +97,7 @@ int vkms_output_init(struct vkms_device *vkmsdev)
struct vkms_config_encoder *possible_encoder;
unsigned long idx = 0;
- connector_cfg->connector = vkms_connector_init(vkmsdev);
+ connector_cfg->connector = vkms_connector_init(vkmsdev, connector_cfg);
if (IS_ERR(connector_cfg->connector)) {
DRM_ERROR("Failed to init connector\n");
return PTR_ERR(connector_cfg->connector);
--
2.56.0