path: root/include
diff options
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2017-10-13 16:08:53 +0200
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2017-10-13 16:59:36 +0200
commit512721a14a2a94b48ca0863d48f9829922a816b8 (patch)
treeee2335f66ba6a08fe7f3570295075f612161f91f /include
parent277b09cfa377c31a8efebca465f096d4eea91ae4 (diff)
drm/drm_of: Move drm_of_panel_bridge_remove_function into header.
Core drm shouldn't depend on anything in drm-kms-helper, or the drm module will fail to load. insmod drm fails with [ 6087.674390] drm: Unknown symbol drm_panel_bridge_remove (err 0) which is defined in drm_kms_helper.ko This call was added by commit c70087e8f16f ("drm/drm_of: add drm_of_panel_bridge_remove function"), and the fix is defining it in the drm_of.h header, to break the circular dependency. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/8f95e623-9480-97dc-2414-77086d8aa49d@linux.intel.com Reviewed-by: Daniel Vetter <daniel.vetter@intel.com> #irc Fixes: c70087e8f16f ("drm/drm_of: add drm_of_panel_bridge_remove function") Acked-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Diffstat (limited to 'include')
1 files changed, 26 insertions, 3 deletions
diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h
index 390966e4a308..d20ec4e0431d 100644
--- a/include/drm/drm_of.h
+++ b/include/drm/drm_of.h
@@ -2,6 +2,9 @@
#define __DRM_OF_H__
#include <linux/of_graph.h>
+#include <drm/drm_bridge.h>
struct component_master_ops;
struct component_match;
@@ -29,8 +32,6 @@ int drm_of_find_panel_or_bridge(const struct device_node *np,
int port, int endpoint,
struct drm_panel **panel,
struct drm_bridge **bridge);
-int drm_of_panel_bridge_remove(const struct device_node *np,
- int port, int endpoint);
static inline uint32_t drm_of_find_possible_crtcs(struct drm_device *dev,
struct device_node *port)
@@ -67,13 +68,35 @@ static inline int drm_of_find_panel_or_bridge(const struct device_node *np,
return -EINVAL;
+ * drm_of_panel_bridge_remove - remove panel bridge
+ * @np: device tree node containing panel bridge output ports
+ *
+ * Remove the panel bridge of a given DT node's port and endpoint number
+ *
+ * Returns zero if successful, or one of the standard error codes if it fails.
+ */
static inline int drm_of_panel_bridge_remove(const struct device_node *np,
int port, int endpoint)
+ struct drm_bridge *bridge;
+ struct device_node *remote;
+ remote = of_graph_get_remote_node(np, port, endpoint);
+ if (!remote)
+ return -ENODEV;
+ bridge = of_drm_find_bridge(remote);
+ drm_panel_bridge_remove(bridge);
+ return 0;
return -EINVAL;
static inline int drm_of_encoder_active_endpoint_id(struct device_node *node,
struct drm_encoder *encoder)

Privacy Policy