drm/bridge: Add stubs for devm_drm_of_get_bridge when OF is disabled
authorjsg <jsg@openbsd.org>
Mon, 5 Sep 2022 14:04:28 +0000 (14:04 +0000)
committerjsg <jsg@openbsd.org>
Mon, 5 Sep 2022 14:04:28 +0000 (14:04 +0000)
From Maxime Ripard
f8b07c05b69969c41efafda7022d6cb184d61bf9 in linux 5.15.y/5.15.65
59050d783848d9b62e9d8fb6ce0cd00771c2bf87 in mainline linux

sys/dev/pci/drm/include/drm/drm_bridge.h

index ef83ce8..ab044e8 100644 (file)
@@ -911,9 +911,20 @@ struct drm_bridge *devm_drm_panel_bridge_add(struct device *dev,
 struct drm_bridge *devm_drm_panel_bridge_add_typed(struct device *dev,
                                                   struct drm_panel *panel,
                                                   u32 connector_type);
+struct drm_connector *drm_panel_bridge_connector(struct drm_bridge *bridge);
+#endif
+
+#if defined(CONFIG_OF) && defined(CONFIG_DRM_PANEL_BRIDGE)
 struct drm_bridge *devm_drm_of_get_bridge(struct device *dev, struct device_node *node,
                                          u32 port, u32 endpoint);
-struct drm_connector *drm_panel_bridge_connector(struct drm_bridge *bridge);
+#else
+static inline struct drm_bridge *devm_drm_of_get_bridge(struct device *dev,
+                                                       struct device_node *node,
+                                                       u32 port,
+                                                       u32 endpoint)
+{
+       return ERR_PTR(-ENODEV);
+}
 #endif
 
 #endif