Le 07/04/2025 à 10:14, José Expósito a écrit :
Implement the drm_connector_funcs.detect() callback to update the
connector status by returning the status stored in the configuration.
Signed-off-by: José Expósito <[email protected]>
Reviewed-by: Louis Chauvet <[email protected]>
---
drivers/gpu/drm/vkms/vkms_connector.c | 28 +++++++++++++++++++++++++++
drivers/gpu/drm/vkms/vkms_connector.h | 3 +++
2 files changed, 31 insertions(+)
diff --git a/drivers/gpu/drm/vkms/vkms_connector.c
b/drivers/gpu/drm/vkms/vkms_connector.c
index 48b10cba322a..89fa8d9d739b 100644
--- a/drivers/gpu/drm/vkms/vkms_connector.c
+++ b/drivers/gpu/drm/vkms/vkms_connector.c
@@ -5,9 +5,37 @@
#include <drm/drm_managed.h>
#include <drm/drm_probe_helper.h>
+#include "vkms_config.h"
#include "vkms_connector.h"
+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;
+ enum drm_connector_status status;
+ struct vkms_config_connector *connector_cfg;
+
+ vkms_connector = drm_connector_to_vkms_connector(connector);
+
+ /*
+ * The connector configuration might not exist if its configfs directory
+ * was deleted. Therefore, use the configuration if present or keep the
+ * current status if we can not access it anymore.
+ */
+ 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);
+ }
+
+ return status;
+}
+
static const struct drm_connector_funcs vkms_connector_funcs = {
+ .detect = vkms_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.reset = drm_atomic_helper_connector_reset,
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
diff --git a/drivers/gpu/drm/vkms/vkms_connector.h
b/drivers/gpu/drm/vkms/vkms_connector.h
index c9149c1b7af0..90f835f70b3b 100644
--- a/drivers/gpu/drm/vkms/vkms_connector.h
+++ b/drivers/gpu/drm/vkms/vkms_connector.h
@@ -5,6 +5,9 @@
#include "vkms_drv.h"
+#define drm_connector_to_vkms_connector(target) \
+ container_of(target, struct vkms_connector, base)
+
/**
* struct vkms_connector - VKMS custom type wrapping around the DRM connector
*
--
Louis Chauvet, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
