Revert "drm/bridge: Add an ->atomic_check() hook"

[linux.git] / include / drm / drm_bridge.h

diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h
index ae0595c701329e561755ad9bee9c514805500065..52d3ed15061854d9edee456255bb7bb5ae81c922 100644 (file)
--- a/include/drm/drm_bridge.h
+++ b/include/drm/drm_bridge.h
@@ -128,9 +128,7 @@ struct drm_bridge_funcs {
         * this function passes all other callbacks must succeed for this
         * configuration.
         *
-        * The mode_fixup callback is optional. &drm_bridge_funcs.mode_fixup()
-        * is not called when &drm_bridge_funcs.atomic_check() is implemented,
-        * so only one of them should be provided.
+        * The @mode_fixup callback is optional.
         *
         * NOTE:
         *
@@ -387,28 +385,6 @@ struct drm_bridge_funcs {
        void (*atomic_destroy_state)(struct drm_bridge *bridge,
                                     struct drm_bridge_state *state);
 
-       /**
-        * @atomic_check:
-        *
-        * This method is responsible for checking bridge state correctness.
-        * It can also check the state of the surrounding components in chain
-        * to make sure the whole pipeline can work properly.
-        *
-        * &drm_bridge_funcs.atomic_check() hooks are called in reverse
-        * order (from the last to the first bridge).
-        *
-        * This method is optional. &drm_bridge_funcs.mode_fixup() is not
-        * called when &drm_bridge_funcs.atomic_check() is implemented, so only
-        * one of them should be provided.
-        *
-        * RETURNS:
-        * zero if the check passed, a negative error code otherwise.
-        */
-       int (*atomic_check)(struct drm_bridge *bridge,
-                           struct drm_bridge_state *bridge_state,
-                           struct drm_crtc_state *crtc_state,
-                           struct drm_connector_state *conn_state);
-
        /**
         * @atomic_reset:
         *
@@ -576,9 +552,6 @@ void drm_bridge_chain_mode_set(struct drm_bridge *bridge,
 void drm_bridge_chain_pre_enable(struct drm_bridge *bridge);
 void drm_bridge_chain_enable(struct drm_bridge *bridge);
 
-int drm_atomic_bridge_chain_check(struct drm_bridge *bridge,
-                                 struct drm_crtc_state *crtc_state,
-                                 struct drm_connector_state *conn_state);
 void drm_atomic_bridge_chain_disable(struct drm_bridge *bridge,
                                     struct drm_atomic_state *state);
 void drm_atomic_bridge_chain_post_disable(struct drm_bridge *bridge,