Revert "drm/bridge: Patch atomic hooks to take a drm_bridge_state"

This reverts commit f7619a58ef92 ("drm/bridge: Patch atomic hooks to
take a drm_bridge_state"). Commit 6ed7e9625fa6 ("drm/bridge: Add a
drm_bridge_state object") introduced a circular dependency between
drm.ko and drm_kms_helper.ko which uncovered a misdesign in how the
whole thing was implemented. Let's revert all patches depending on the
bridge_state infrastructure for now.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200107185807.606999-5-boris.brezillon@collabora.com

diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index 6fab71985cd49eeb000431172b315399c26ed504..6effe532f82005805c93b1ac98b059011a91e54d 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -1289,21 +1289,19 @@ struct drm_crtc *analogix_dp_get_new_crtc(struct analogix_dp_device *dp,
        return conn_state->crtc;
 }
 
-static void
-analogix_dp_bridge_atomic_pre_enable(struct drm_bridge *bridge,
-                                    struct drm_bridge_state *old_bridge_state)
+static void analogix_dp_bridge_atomic_pre_enable(struct drm_bridge *bridge,
+                                                struct drm_atomic_state *state)
 {
-       struct drm_atomic_state *old_state = old_bridge_state->base.state;
        struct analogix_dp_device *dp = bridge->driver_private;
        struct drm_crtc *crtc;
        struct drm_crtc_state *old_crtc_state;
        int ret;
 
-       crtc = analogix_dp_get_new_crtc(dp, old_state);
+       crtc = analogix_dp_get_new_crtc(dp, state);
        if (!crtc)
                return;
 
-       old_crtc_state = drm_atomic_get_old_crtc_state(old_state, crtc);
+       old_crtc_state = drm_atomic_get_old_crtc_state(state, crtc);
        /* Don't touch the panel if we're coming back from PSR */
        if (old_crtc_state && old_crtc_state->self_refresh_active)
                return;
@@ -1368,22 +1366,20 @@ static int analogix_dp_set_bridge(struct analogix_dp_device *dp)
        return ret;
 }
 
-static void
-analogix_dp_bridge_atomic_enable(struct drm_bridge *bridge,
-                                struct drm_bridge_state *old_bridge_state)
+static void analogix_dp_bridge_atomic_enable(struct drm_bridge *bridge,
+                                            struct drm_atomic_state *state)
 {
-       struct drm_atomic_state *old_state = old_bridge_state->base.state;
        struct analogix_dp_device *dp = bridge->driver_private;
        struct drm_crtc *crtc;
        struct drm_crtc_state *old_crtc_state;
        int timeout_loop = 0;
        int ret;
 
-       crtc = analogix_dp_get_new_crtc(dp, old_state);
+       crtc = analogix_dp_get_new_crtc(dp, state);
        if (!crtc)
                return;
 
-       old_crtc_state = drm_atomic_get_old_crtc_state(old_state, crtc);
+       old_crtc_state = drm_atomic_get_old_crtc_state(state, crtc);
        /* Not a full enable, just disable PSR and continue */
        if (old_crtc_state && old_crtc_state->self_refresh_active) {
                ret = analogix_dp_disable_psr(dp);
@@ -1444,20 +1440,18 @@ static void analogix_dp_bridge_disable(struct drm_bridge *bridge)
        dp->dpms_mode = DRM_MODE_DPMS_OFF;
 }
 
-static void
-analogix_dp_bridge_atomic_disable(struct drm_bridge *bridge,
-                                 struct drm_bridge_state *old_bridge_state)
+static void analogix_dp_bridge_atomic_disable(struct drm_bridge *bridge,
+                                             struct drm_atomic_state *state)
 {
-       struct drm_atomic_state *old_state = old_bridge_state->base.state;
        struct analogix_dp_device *dp = bridge->driver_private;
        struct drm_crtc *crtc;
        struct drm_crtc_state *new_crtc_state = NULL;
 
-       crtc = analogix_dp_get_new_crtc(dp, old_state);
+       crtc = analogix_dp_get_new_crtc(dp, state);
        if (!crtc)
                goto out;
 
-       new_crtc_state = drm_atomic_get_new_crtc_state(old_state, crtc);
+       new_crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
        if (!new_crtc_state)
                goto out;
 
@@ -1469,21 +1463,20 @@ analogix_dp_bridge_atomic_disable(struct drm_bridge *bridge,
        analogix_dp_bridge_disable(bridge);
 }
 
-static void
-analogix_dp_bridge_atomic_post_disable(struct drm_bridge *bridge,
-                               struct drm_bridge_state *old_bridge_state)
+static
+void analogix_dp_bridge_atomic_post_disable(struct drm_bridge *bridge,
+                                           struct drm_atomic_state *state)
 {
-       struct drm_atomic_state *old_state = old_bridge_state->base.state;
        struct analogix_dp_device *dp = bridge->driver_private;
        struct drm_crtc *crtc;
        struct drm_crtc_state *new_crtc_state;
        int ret;
 
-       crtc = analogix_dp_get_new_crtc(dp, old_state);
+       crtc = analogix_dp_get_new_crtc(dp, state);
        if (!crtc)
                return;
 
-       new_crtc_state = drm_atomic_get_new_crtc_state(old_state, crtc);
+       new_crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
        if (!new_crtc_state || !new_crtc_state->self_refresh_active)
                return;
 

diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c
index 872e159fcb42c328c03e9336b0158fa09a255e40..a213c9042f2c8fac694aa44f4da92e6696ce6972 100644 (file)
--- a/drivers/gpu/drm/drm_bridge.c
+++ b/drivers/gpu/drm/drm_bridge.c
@@ -501,19 +501,10 @@ void drm_atomic_bridge_chain_disable(struct drm_bridge *bridge,
 
        encoder = bridge->encoder;
        list_for_each_entry_reverse(iter, &encoder->bridge_chain, chain_node) {
-               if (iter->funcs->atomic_disable) {
-                       struct drm_bridge_state *old_bridge_state;
-
-                       old_bridge_state =
-                               drm_atomic_get_old_bridge_state(old_state,
-                                                               iter);
-                       if (WARN_ON(!old_bridge_state))
-                               return;
-
-                       iter->funcs->atomic_disable(iter, old_bridge_state);
-               } else if (iter->funcs->disable) {
+               if (iter->funcs->atomic_disable)
+                       iter->funcs->atomic_disable(iter, old_state);
+               else if (iter->funcs->disable)
                        iter->funcs->disable(iter);
-               }
 
                if (iter == bridge)
                        break;
@@ -544,20 +535,10 @@ void drm_atomic_bridge_chain_post_disable(struct drm_bridge *bridge,
 
        encoder = bridge->encoder;
        list_for_each_entry_from(bridge, &encoder->bridge_chain, chain_node) {
-               if (bridge->funcs->atomic_post_disable) {
-                       struct drm_bridge_state *old_bridge_state;
-
-                       old_bridge_state =
-                               drm_atomic_get_old_bridge_state(old_state,
-                                                               bridge);
-                       if (WARN_ON(!old_bridge_state))
-                               return;
-
-                       bridge->funcs->atomic_post_disable(bridge,
-                                                          old_bridge_state);
-               } else if (bridge->funcs->post_disable) {
+               if (bridge->funcs->atomic_post_disable)
+                       bridge->funcs->atomic_post_disable(bridge, old_state);
+               else if (bridge->funcs->post_disable)
                        bridge->funcs->post_disable(bridge);
-               }
        }
 }
 EXPORT_SYMBOL(drm_atomic_bridge_chain_post_disable);
@@ -586,19 +567,10 @@ void drm_atomic_bridge_chain_pre_enable(struct drm_bridge *bridge,
 
        encoder = bridge->encoder;
        list_for_each_entry_reverse(iter, &encoder->bridge_chain, chain_node) {
-               if (iter->funcs->atomic_pre_enable) {
-                       struct drm_bridge_state *old_bridge_state;
-
-                       old_bridge_state =
-                               drm_atomic_get_old_bridge_state(old_state,
-                                                               iter);
-                       if (WARN_ON(!old_bridge_state))
-                               return;
-
-                       iter->funcs->atomic_pre_enable(iter, old_bridge_state);
-               } else if (iter->funcs->pre_enable) {
+               if (iter->funcs->atomic_pre_enable)
+                       iter->funcs->atomic_pre_enable(iter, old_state);
+               else if (iter->funcs->pre_enable)
                        iter->funcs->pre_enable(iter);
-               }
 
                if (iter == bridge)
                        break;
@@ -628,19 +600,10 @@ void drm_atomic_bridge_chain_enable(struct drm_bridge *bridge,
 
        encoder = bridge->encoder;
        list_for_each_entry_from(bridge, &encoder->bridge_chain, chain_node) {
-               if (bridge->funcs->atomic_enable) {
-                       struct drm_bridge_state *old_bridge_state;
-
-                       old_bridge_state =
-                               drm_atomic_get_old_bridge_state(old_state,
-                                                               bridge);
-                       if (WARN_ON(!old_bridge_state))
-                               return;
-
-                       bridge->funcs->atomic_enable(bridge, old_bridge_state);
-               } else if (bridge->funcs->enable) {
+               if (bridge->funcs->atomic_enable)
+                       bridge->funcs->atomic_enable(bridge, old_state);
+               else if (bridge->funcs->enable)
                        bridge->funcs->enable(bridge);
-               }
        }
 }
 EXPORT_SYMBOL(drm_atomic_bridge_chain_enable);

diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c
index 961519ce6634afa5a54bbea7e8e02ee9ba93c650..8ffa4fbbdeb3839afc5d17414744b0a453f01e27 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_lvds.c
+++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c
@@ -590,9 +590,8 @@ static void __rcar_lvds_atomic_enable(struct drm_bridge *bridge,
 }
 
 static void rcar_lvds_atomic_enable(struct drm_bridge *bridge,
-                                   struct drm_bridge_state *old_bridge_state)
+                                   struct drm_atomic_state *state)
 {
-       struct drm_atomic_state *state = old_bridge_state->base.state;
        struct drm_connector *connector;
        struct drm_crtc *crtc;
 
@@ -604,7 +603,7 @@ static void rcar_lvds_atomic_enable(struct drm_bridge *bridge,
 }
 
 static void rcar_lvds_atomic_disable(struct drm_bridge *bridge,
-                                    struct drm_bridge_state *old_bridge_state)
+                                    struct drm_atomic_state *state)
 {
        struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);
 
@@ -619,8 +618,7 @@ static void rcar_lvds_atomic_disable(struct drm_bridge *bridge,
 
        /* Disable the companion LVDS encoder in dual-link mode. */
        if (lvds->link_type != RCAR_LVDS_SINGLE_LINK && lvds->companion)
-               lvds->companion->funcs->atomic_disable(lvds->companion,
-                                                      old_bridge_state);
+               lvds->companion->funcs->atomic_disable(lvds->companion, state);
 
        clk_disable_unprepare(lvds->clocks.mod);
 }

diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h
index 52d3ed15061854d9edee456255bb7bb5ae81c922..fc7c71f4de55fabac5b4cb5c3c1c74796a853bcb 100644 (file)
--- a/include/drm/drm_bridge.h
+++ b/include/drm/drm_bridge.h
@@ -282,7 +282,7 @@ struct drm_bridge_funcs {
         * The @atomic_pre_enable callback is optional.
         */
        void (*atomic_pre_enable)(struct drm_bridge *bridge,
-                                 struct drm_bridge_state *old_bridge_state);
+                                 struct drm_atomic_state *old_state);
 
        /**
         * @atomic_enable:
@@ -307,7 +307,7 @@ struct drm_bridge_funcs {
         * The @atomic_enable callback is optional.
         */
        void (*atomic_enable)(struct drm_bridge *bridge,
-                             struct drm_bridge_state *old_bridge_state);
+                             struct drm_atomic_state *old_state);
        /**
         * @atomic_disable:
         *
@@ -330,7 +330,7 @@ struct drm_bridge_funcs {
         * The @atomic_disable callback is optional.
         */
        void (*atomic_disable)(struct drm_bridge *bridge,
-                              struct drm_bridge_state *old_bridge_state);
+                              struct drm_atomic_state *old_state);
 
        /**
         * @atomic_post_disable:
@@ -356,7 +356,7 @@ struct drm_bridge_funcs {
         * The @atomic_post_disable callback is optional.
         */
        void (*atomic_post_disable)(struct drm_bridge *bridge,
-                                   struct drm_bridge_state *old_bridge_state);
+                                   struct drm_atomic_state *old_state);
 
        /**
         * @atomic_duplicate_state: