The global bridges_list holding all the bridges between drm_bridge_add()
and drm_bridge_remove() cannot be inspected via debugfs. Add a file showing
it.
To avoid code duplication, move the code printing a bridge info to a common
function.
Signed-off-by: Luca Ceresoli <luca.ceresoli@xxxxxxxxxxx>
---
Changed in v7:
- move implementation to drm_bridge.c to avoid exporting bridge_list and
bridge_mutex
This patch was added in v6.
---
drivers/gpu/drm/drm_bridge.c | 64 +++++++++++++++++++++++++++---------------
drivers/gpu/drm/drm_debugfs.c | 15 ++++++++++
drivers/gpu/drm/drm_drv.c | 1 +
drivers/gpu/drm/drm_internal.h | 5 ++++
include/drm/drm_bridge.h | 2 ++
5 files changed, 65 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c
index 6e1e02c1cf443fbaa764765ad369b7a34cc03f2d..c840b020cd1c9a39212ad90cca54aa93de2475cd 100644
--- a/drivers/gpu/drm/drm_bridge.c
+++ b/drivers/gpu/drm/drm_bridge.c
@@ -1336,36 +1336,56 @@ EXPORT_SYMBOL(of_drm_find_bridge);
#endif
#ifdef CONFIG_DEBUG_FS
+static void drm_bridge_debugfs_show_bridge(struct drm_printer *p,
+ struct drm_bridge *bridge,
+ unsigned int idx)
+{
+ drm_printf(p, "bridge[%u]: %ps\n", idx++, bridge->funcs);
+ drm_printf(p, "\ttype: [%d] %s\n",
+ bridge->type,
+ drm_get_connector_type_name(bridge->type));
+
+ if (bridge->of_node)
+ drm_printf(p, "\tOF: %pOFfc\n", bridge->of_node);
+
+ drm_printf(p, "\tops: [0x%x]", bridge->ops);
+ if (bridge->ops & DRM_BRIDGE_OP_DETECT)
+ drm_puts(p, " detect");
+ if (bridge->ops & DRM_BRIDGE_OP_EDID)
+ drm_puts(p, " edid");
+ if (bridge->ops & DRM_BRIDGE_OP_HPD)
+ drm_puts(p, " hpd");
+ if (bridge->ops & DRM_BRIDGE_OP_MODES)
+ drm_puts(p, " modes");
+ if (bridge->ops & DRM_BRIDGE_OP_HDMI)
+ drm_puts(p, " hdmi");
+ drm_puts(p, "\n");
+}
+
void drm_bridge_debugfs_show_encoder_bridges(struct drm_printer *p,
struct drm_encoder *encoder)
{
struct drm_bridge *bridge;
unsigned int idx = 0;
- drm_for_each_bridge_in_chain(encoder, bridge) {
- drm_printf(p, "bridge[%u]: %ps\n", idx++, bridge->funcs);
- drm_printf(p, "\ttype: [%d] %s\n",
- bridge->type,
- drm_get_connector_type_name(bridge->type));
-
- if (bridge->of_node)
- drm_printf(p, "\tOF: %pOFfc\n", bridge->of_node);
-
- drm_printf(p, "\tops: [0x%x]", bridge->ops);
- if (bridge->ops & DRM_BRIDGE_OP_DETECT)
- drm_puts(p, " detect");
- if (bridge->ops & DRM_BRIDGE_OP_EDID)
- drm_puts(p, " edid");
- if (bridge->ops & DRM_BRIDGE_OP_HPD)
- drm_puts(p, " hpd");
- if (bridge->ops & DRM_BRIDGE_OP_MODES)
- drm_puts(p, " modes");
- if (bridge->ops & DRM_BRIDGE_OP_HDMI)
- drm_puts(p, " hdmi");
- drm_puts(p, "\n");
- }
+ drm_for_each_bridge_in_chain(encoder, bridge)
+ drm_bridge_debugfs_show_bridge(p, bridge, idx++);
}
EXPORT_SYMBOL(drm_bridge_debugfs_show_encoder_bridges);
+
+void drm_bridge_debugfs_show_all_bridges(struct drm_printer *p)
+{
+ struct drm_bridge *bridge;
+ unsigned int idx = 0;
+
+ mutex_lock(&bridge_lock);
+
+ list_for_each_entry(bridge, &bridge_list, list)
+ drm_bridge_debugfs_show_bridge(p, bridge, idx++);
+
+ mutex_unlock(&bridge_lock);
+}
+EXPORT_SYMBOL(drm_bridge_debugfs_show_all_bridges);
#endif
MODULE_AUTHOR("Ajay Kumar <ajaykumar.rs@xxxxxxxxxxx>");
diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
index a625c0c9a9aa076af19c8ba47564dbb24ba71c9a..74aa38ca96d23d1e7f9862ad092e72c106053fe7 100644
--- a/drivers/gpu/drm/drm_debugfs.c
+++ b/drivers/gpu/drm/drm_debugfs.c
@@ -779,3 +779,18 @@ void drm_debugfs_encoder_remove(struct drm_encoder *encoder)
debugfs_remove_recursive(encoder->debugfs_entry);
encoder->debugfs_entry = NULL;
}
+
+static int allbridges_show(struct seq_file *m, void *data)
+{
+ struct drm_printer p = drm_seq_file_printer(m);
+
+ drm_bridge_debugfs_show_all_bridges(&p);
+
+ return 0;
+}
+DEFINE_SHOW_ATTRIBUTE(allbridges);
+
+void drm_debugfs_global_add(struct dentry *root)
+{
+ debugfs_create_file("bridges", 0444, root, NULL, &allbridges_fops);
+}
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 3cf440eee8a2ab3de134d925db8f1d2ce68062b7..9b6d7bd16ba409b6a9155a9fecbec6bfdd5ea0c2 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -1120,6 +1120,7 @@ static int __init drm_core_init(void)
}
drm_debugfs_root = debugfs_create_dir("dri", NULL);
+ drm_debugfs_global_add(drm_debugfs_root);
ret = register_chrdev(DRM_MAJOR, "drm", &drm_stub_fops);
if (ret < 0)
diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h
index b2b6a8e49dda46f1cb3b048ef7b28356dd3aaa4e..4c9c56b68ec1149a2def8cdcbdeda4946dbffb10 100644
--- a/drivers/gpu/drm/drm_internal.h
+++ b/drivers/gpu/drm/drm_internal.h
@@ -196,6 +196,7 @@ void drm_debugfs_crtc_remove(struct drm_crtc *crtc);
void drm_debugfs_crtc_crc_add(struct drm_crtc *crtc);
void drm_debugfs_encoder_add(struct drm_encoder *encoder);
void drm_debugfs_encoder_remove(struct drm_encoder *encoder);
+void drm_debugfs_global_add(struct dentry *drm_debugfs_root);
#else
static inline void drm_debugfs_dev_fini(struct drm_device *dev)
{
@@ -241,6 +242,10 @@ static inline void drm_debugfs_encoder_remove(struct drm_encoder *encoder)
{
}
+static inline void drm_debugfs_global_add(struct dentry *drm_debugfs_root)
+{
+}
+
#endif
drm_ioctl_t drm_version;
diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h
index 23c062853e7bb42d8d73af35ef7f16fb37345a37..9dd2654d1cd7212fb798432110776e5818fcb5a0 100644
--- a/include/drm/drm_bridge.h
+++ b/include/drm/drm_bridge.h
@@ -1111,9 +1111,11 @@ static inline struct drm_bridge *drmm_of_get_bridge(struct drm_device *drm,
#ifdef CONFIG_DEBUG_FS
void drm_bridge_debugfs_show_encoder_bridges(struct drm_printer *p,
struct drm_encoder *encoder);
+void drm_bridge_debugfs_show_all_bridges(struct drm_printer *p);
#else
static inline void drm_bridge_debugfs_show_encoder_bridges(struct drm_printer *p,
struct drm_encoder *encoder) {}
+static inline void drm_bridge_debugfs_show_all_bridges(struct drm_printer *p) {}
#endif
#endif
--
2.48.1
