Hi Boris,
Thank you for the patch.
On Wed, Oct 23, 2019 at 05:45:02PM +0200, Boris Brezillon wrote:
> This way the drm_bridge_funcs interface is consistent with the rest of
> the subsystem.
>
> The only driver implementing those hooks (analogix DP) is patched too.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxx>
> ---
> Changes in v3:
> * Old state clarification moved to a separate patch
>
> Changes in v2:
> * Pass the old bridge state
> ---
> .../drm/bridge/analogix/analogix_dp_core.c | 12 ++--
> drivers/gpu/drm/drm_bridge.c | 61 +++++++++++++++----
> include/drm/drm_bridge.h | 24 ++++----
> 3 files changed, 69 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> index bb411fe52ae8..e438e757f2ce 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> @@ -1290,8 +1290,9 @@ struct drm_crtc *analogix_dp_get_new_crtc(struct analogix_dp_device *dp,
> }
>
> static void analogix_dp_bridge_atomic_pre_enable(struct drm_bridge *bridge,
> - struct drm_atomic_state *state)
> + struct drm_bridge_state *bstate)
Should we name the parameter old_state ? Same comment below.
With this addressed,
Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> {
> + struct drm_atomic_state *state = bstate->base.state;
> struct analogix_dp_device *dp = bridge->driver_private;
> struct drm_crtc *crtc;
> struct drm_crtc_state *old_crtc_state;
> @@ -1367,8 +1368,9 @@ static int analogix_dp_set_bridge(struct analogix_dp_device *dp)
> }
>
> static void analogix_dp_bridge_atomic_enable(struct drm_bridge *bridge,
> - struct drm_atomic_state *state)
> + struct drm_bridge_state *bstate)
> {
> + struct drm_atomic_state *state = bstate->base.state;
> struct analogix_dp_device *dp = bridge->driver_private;
> struct drm_crtc *crtc;
> struct drm_crtc_state *old_crtc_state;
> @@ -1441,8 +1443,9 @@ static void analogix_dp_bridge_disable(struct drm_bridge *bridge)
> }
>
> static void analogix_dp_bridge_atomic_disable(struct drm_bridge *bridge,
> - struct drm_atomic_state *state)
> + struct drm_bridge_state *bstate)
> {
> + struct drm_atomic_state *state = bstate->base.state;
> struct analogix_dp_device *dp = bridge->driver_private;
> struct drm_crtc *crtc;
> struct drm_crtc_state *new_crtc_state = NULL;
> @@ -1465,8 +1468,9 @@ static void analogix_dp_bridge_atomic_disable(struct drm_bridge *bridge,
>
> static
> void analogix_dp_bridge_atomic_post_disable(struct drm_bridge *bridge,
> - struct drm_atomic_state *state)
> + struct drm_bridge_state *bstate)
> {
> + struct drm_atomic_state *state = bstate->base.state;
> struct analogix_dp_device *dp = bridge->driver_private;
> struct drm_crtc *crtc;
> struct drm_crtc_state *new_crtc_state;
> diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c
> index ca74bfe028c9..377866e3214f 100644
> --- a/drivers/gpu/drm/drm_bridge.c
> +++ b/drivers/gpu/drm/drm_bridge.c
> @@ -468,10 +468,19 @@ 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)
> - iter->funcs->atomic_disable(iter, old_state);
> - else if (iter->funcs->disable)
> + 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) {
> iter->funcs->disable(iter);
> + }
>
> if (iter == bridge)
> break;
> @@ -503,10 +512,20 @@ 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)
> - bridge->funcs->atomic_post_disable(bridge, old_state);
> - else if (bridge->funcs->post_disable)
> + 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) {
> bridge->funcs->post_disable(bridge);
> + }
> }
> }
> EXPORT_SYMBOL(drm_atomic_bridge_chain_post_disable);
> @@ -536,10 +555,19 @@ void drm_atomic_bridge_chain_pre_enable(struct drm_bridge *bridge,
> encoder = bridge->encoder;
> list_for_each_entry_reverse(iter, &bridge->encoder->bridge_chain,
> chain_node) {
> - if (iter->funcs->atomic_pre_enable)
> - iter->funcs->atomic_pre_enable(iter, old_state);
> - else if (iter->funcs->pre_enable)
> + 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) {
> iter->funcs->pre_enable(iter);
> + }
>
> if (iter == bridge)
> break;
> @@ -570,10 +598,19 @@ void drm_atomic_bridge_chain_enable(struct drm_bridge *bridge,
> encoder = bridge->encoder;
> list_for_each_entry_from(bridge, &bridge->encoder->bridge_chain,
> chain_node) {
> - if (bridge->funcs->atomic_enable)
> - bridge->funcs->atomic_enable(bridge, old_state);
> - else if (bridge->funcs->enable)
> + 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) {
> bridge->funcs->enable(bridge);
> + }
> }
> }
> EXPORT_SYMBOL(drm_atomic_bridge_chain_enable);
> diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h
> index e814e6d6e7c2..b1f557d8dba9 100644
> --- a/include/drm/drm_bridge.h
> +++ b/include/drm/drm_bridge.h
> @@ -266,8 +266,8 @@ struct drm_bridge_funcs {
> * bridge's @atomic_pre_enable or @pre_enable function. If the preceding
> * element is a &drm_encoder it's called right before the encoder's
> * &drm_encoder_helper_funcs.atomic_enable hook.
> - * This hook is passed the old atomic state (atomic state after new/old
> - * states have been swapped).
> + * This hook is passed the old bridge state (the new one can be
> + * retrieved from bridge->state).
> *
> * The display pipe (i.e. clocks and timing signals) feeding this bridge
> * will not yet be running when this callback is called. The bridge must
> @@ -283,7 +283,7 @@ struct drm_bridge_funcs {
> * The @atomic_pre_enable callback is optional.
> */
> void (*atomic_pre_enable)(struct drm_bridge *bridge,
> - struct drm_atomic_state *old_state);
> + struct drm_bridge_state *old_bridge_state);
>
> /**
> * @atomic_enable:
> @@ -294,8 +294,8 @@ struct drm_bridge_funcs {
> * bridge's @atomic_enable or @enable function. If the preceding element
> * is a &drm_encoder it's called right after the encoder's
> * &drm_encoder_helper_funcs.atomic_enable hook.
> - * This hook is passed the old atomic state (atomic state after new/old
> - * states have been swapped).
> + * This hook is passed the old bridge state (the new one can be
> + * retrieved from bridge->state).
> *
> * The bridge can assume that the display pipe (i.e. clocks and timing
> * signals) feeding it is running when this callback is called. This
> @@ -310,7 +310,7 @@ struct drm_bridge_funcs {
> * The @atomic_enable callback is optional.
> */
> void (*atomic_enable)(struct drm_bridge *bridge,
> - struct drm_atomic_state *old_state);
> + struct drm_bridge_state *old_bridge_state);
> /**
> * @atomic_disable:
> *
> @@ -320,8 +320,8 @@ struct drm_bridge_funcs {
> * bridge's @atomic_disable or @disable vfunc. If the preceding element
> * is a &drm_encoder it's called right before the
> * &drm_encoder_helper_funcs.atomic_disable hook.
> - * This hook is passed the old atomic state (atomic state after new/old
> - * states have been swapped).
> + * This hook is passed the old bridge state (the new one can be
> + * retrieved from bridge->state).
> *
> * The bridge can assume that the display pipe (i.e. clocks and timing
> * signals) feeding it is still running when this callback is called.
> @@ -335,7 +335,7 @@ struct drm_bridge_funcs {
> * The @atomic_disable callback is optional.
> */
> void (*atomic_disable)(struct drm_bridge *bridge,
> - struct drm_atomic_state *old_state);
> + struct drm_bridge_state *old_bridge_state);
>
> /**
> * @atomic_post_disable:
> @@ -346,8 +346,8 @@ struct drm_bridge_funcs {
> * @atomic_post_disable or @post_disable function. If the preceding
> * element is a &drm_encoder it's called right after the encoder's
> * &drm_encoder_helper_funcs.atomic_disable hook.
> - * This hook is passed the old atomic state (atomic state after new/old
> - * states have been swapped).
> + * This hook is passed the old bridge state (the new one can be
> + * retrieved from bridge->state).
> *
> * The bridge must assume that the display pipe (i.e. clocks and timing
> * signals) feeding it is no longer running when this callback is
> @@ -363,7 +363,7 @@ struct drm_bridge_funcs {
> * The @atomic_post_disable callback is optional.
> */
> void (*atomic_post_disable)(struct drm_bridge *bridge,
> - struct drm_atomic_state *old_state);
> + struct drm_bridge_state *old_bridge_state);
>
> /**
> * @atomic_duplicate_state:
--
Regards,
Laurent Pinchart
