Revert "drm/bridge: Add a drm_bridge_state object"

[linux.git] / drivers / gpu / drm / drm_atomic_helper.c

diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index ad8eae98d9e8a7508b4a8e3e85b8cc19baa0af82..4511c2e07bb9d60528b2d3143880c63e1300f38d 100644 (file)
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -730,26 +730,6 @@ drm_atomic_helper_check_modeset(struct drm_device *dev,
                        return ret;
        }
 
-       /*
-        * Iterate over all connectors again, and add all affected bridges to
-        * the state.
-        */
-       for_each_oldnew_connector_in_state(state, connector,
-                                          old_connector_state,
-                                          new_connector_state, i) {
-               struct drm_encoder *encoder;
-
-               encoder = old_connector_state->best_encoder;
-               ret = drm_atomic_add_encoder_bridges(state, encoder);
-               if (ret)
-                       return ret;
-
-               encoder = new_connector_state->best_encoder;
-               ret = drm_atomic_add_encoder_bridges(state, encoder);
-               if (ret)
-                       return ret;
-       }
-
        ret = mode_valid(state);
        if (ret)
                return ret;