Merge tag 'for-linus-5.9-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / include / drm / drm_bridge.h

diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h
index ea2aa5e..2195daa 100644 (file)
--- a/include/drm/drm_bridge.h
+++ b/include/drm/drm_bridge.h
@@ -35,6 +35,7 @@
 struct drm_bridge;
 struct drm_bridge_timings;
 struct drm_connector;
+struct drm_display_info;
 struct drm_panel;
 struct edid;
 struct i2c_adapter;
@@ -112,6 +113,7 @@ struct drm_bridge_funcs {
         * drm_mode_status Enum
         */
        enum drm_mode_status (*mode_valid)(struct drm_bridge *bridge,
+                                          const struct drm_display_info *info,
                                           const struct drm_display_mode *mode);
 
        /**
@@ -473,7 +475,7 @@ struct drm_bridge_funcs {
         * one of them should be provided.
         *
         * If drivers need to tweak &drm_bridge_state.input_bus_cfg.flags or
-        * &drm_bridge_state.output_bus_cfg.flags it should should happen in
+        * &drm_bridge_state.output_bus_cfg.flags it should happen in
         * this function. By default the &drm_bridge_state.output_bus_cfg.flags
         * field is set to the next bridge
         * &drm_bridge_state.input_bus_cfg.flags value or
@@ -836,6 +838,7 @@ bool drm_bridge_chain_mode_fixup(struct drm_bridge *bridge,
                                 struct drm_display_mode *adjusted_mode);
 enum drm_mode_status
 drm_bridge_chain_mode_valid(struct drm_bridge *bridge,
+                           const struct drm_display_info *info,
                            const struct drm_display_mode *mode);
 void drm_bridge_chain_disable(struct drm_bridge *bridge);
 void drm_bridge_chain_post_disable(struct drm_bridge *bridge);