From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Boris Brezillon <boris.brezillon@collabora.com>
Cc: Mark Rutland <mark.rutland@arm.com>,
Neil Armstrong <narmstrong@baylibre.com>,
dri-devel@lists.freedesktop.org,
Thierry Reding <thierry.reding@gmail.com>,
kernel@collabora.com, Sam Ravnborg <sam@ravnborg.org>,
Nikita Yushchenko <nikita.yoush@cogentembedded.com>,
Andrey Smirnov <andrew.smirnov@gmail.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
Chris Healy <cphealy@gmail.com>,
devicetree@vger.kernel.org, Jonas Karlman <jonas@kwiboo.se>,
Rob Herring <robh+dt@kernel.org>,
Jernej Skrabec <jernej.skrabec@siol.net>,
Seung-Woo Kim <sw0312.kim@samsung.com>
Subject: Re: [PATCH v3 11/21] drm/bridge: Patch atomic hooks to take a drm_bridge_state
Date: Mon, 2 Dec 2019 18:57:46 +0200 [thread overview]
Message-ID: <20191202165746.GO4929@pendragon.ideasonboard.com> (raw)
In-Reply-To: <20191023154512.9762-12-boris.brezillon@collabora.com>
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@collabora.com>
> ---
> 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@ideasonboard.com>
> {
> + 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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-12-02 16:57 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-23 15:44 [PATCH v3 00/21] drm: Add support for bus-format negotiation Boris Brezillon
2019-10-23 15:44 ` [PATCH v3 01/21] drm/vc4: Declare the DSI encoder as a bridge element Boris Brezillon
2019-11-24 10:01 ` Laurent Pinchart
2019-11-24 10:47 ` Boris Brezillon
2019-10-23 15:44 ` [PATCH v3 02/21] drm/exynos: Don't reset bridge->next Boris Brezillon
2019-10-28 12:19 ` Inki Dae
2019-10-23 15:44 ` [PATCH v3 03/21] drm/exynos: Declare the DSI encoder as a bridge element Boris Brezillon
2019-11-24 10:24 ` Laurent Pinchart
2019-11-24 13:17 ` Boris Brezillon
2019-11-24 13:28 ` Boris Brezillon
2019-11-24 14:02 ` Laurent Pinchart
2019-10-23 15:44 ` [PATCH v3 04/21] drm/bridge: Rename bridge helpers targeting a bridge chain Boris Brezillon
2019-10-25 13:26 ` Neil Armstrong
2019-11-24 10:28 ` Laurent Pinchart
2019-10-23 15:44 ` [PATCH v3 05/21] drm/bridge: Introduce drm_bridge_chain_get_next_bridge() Boris Brezillon
2019-10-25 13:27 ` Neil Armstrong
2019-11-24 10:33 ` Laurent Pinchart
2019-11-24 10:56 ` Boris Brezillon
2019-11-24 14:04 ` Laurent Pinchart
2019-10-23 15:44 ` [PATCH v3 06/21] drm: Stop accessing encoder->bridge directly Boris Brezillon
2019-10-25 13:28 ` Neil Armstrong
2019-11-24 10:39 ` Laurent Pinchart
2019-11-24 13:40 ` Boris Brezillon
2019-10-23 15:44 ` [PATCH v3 07/21] drm/bridge: Make the bridge chain a double-linked list Boris Brezillon
2019-10-25 13:29 ` Neil Armstrong
2019-11-05 16:02 ` Neil Armstrong
2019-11-24 7:48 ` Boris Brezillon
2019-11-24 13:57 ` Laurent Pinchart
2019-10-23 15:44 ` [PATCH v3 08/21] drm/bridge: Add the drm_for_each_bridge_in_chain() helper Boris Brezillon
2019-10-25 13:30 ` Neil Armstrong
2019-11-24 14:07 ` Laurent Pinchart
2019-10-23 15:45 ` [PATCH v3 09/21] drm/bridge: Add a drm_bridge_state object Boris Brezillon
2019-10-25 14:35 ` Neil Armstrong
2019-11-05 16:05 ` Neil Armstrong
2019-11-24 7:50 ` Boris Brezillon
2019-12-02 16:42 ` Laurent Pinchart
2019-10-23 15:45 ` [PATCH v3 10/21] drm/bridge: Clarify the atomic enable/disable hooks semantics Boris Brezillon
2019-10-25 14:33 ` Neil Armstrong
2019-12-02 16:50 ` Laurent Pinchart
2019-10-23 15:45 ` [PATCH v3 11/21] drm/bridge: Patch atomic hooks to take a drm_bridge_state Boris Brezillon
2019-12-02 16:57 ` Laurent Pinchart [this message]
2019-10-23 15:45 ` [PATCH v3 12/21] drm/bridge: Add an ->atomic_check() hook Boris Brezillon
2019-10-25 14:35 ` Neil Armstrong
2019-12-02 17:03 ` Laurent Pinchart
2019-12-03 10:11 ` Boris Brezillon
2019-12-03 10:15 ` Laurent Pinchart
2019-10-23 15:45 ` [PATCH v3 13/21] drm/bridge: Add the drm_bridge_chain_get_prev_bridge() helper Boris Brezillon
2019-10-25 14:34 ` Neil Armstrong
2019-12-02 17:05 ` Laurent Pinchart
2019-10-23 15:45 ` [PATCH v3 14/21] drm/bridge: Add the necessary bits to support bus format negotiation Boris Brezillon
2019-12-03 10:03 ` Laurent Pinchart
2019-10-23 15:45 ` [PATCH v3 15/21] drm/imx: pd: Use bus format/flags provided by the bridge when available Boris Brezillon
2019-12-03 13:50 ` Philipp Zabel
2019-10-23 15:45 ` [PATCH v3 16/21] drm/bridge: lvds-encoder: Implement basic bus format negotiation Boris Brezillon
2019-12-03 10:14 ` Laurent Pinchart
2019-10-23 15:45 ` [PATCH v3 17/21] dt-bindings: display: bridge: lvds-transmitter: Add new props Boris Brezillon
2019-10-25 19:57 ` Rob Herring
2019-10-31 13:04 ` Boris Brezillon
2019-12-02 17:11 ` Laurent Pinchart
2019-12-03 12:38 ` Boris Brezillon
2019-12-03 13:22 ` Laurent Pinchart
2019-10-23 15:45 ` [PATCH v3 18/21] drm/bridge: panel: Propage bus format/flags Boris Brezillon
2019-12-03 10:17 ` Laurent Pinchart
2020-01-22 9:27 ` Boris Brezillon
2019-10-23 15:45 ` [PATCH v3 19/21] drm/panel: simple: Add support for Toshiba LTA089AC29000 panel Boris Brezillon
2019-12-02 17:17 ` Laurent Pinchart
2019-12-03 12:42 ` Boris Brezillon
2019-12-03 13:28 ` Laurent Pinchart
2019-10-23 15:45 ` [PATCH v3 20/21] dt-bindings: display: panel: Add the LTA089AC29000 variant Boris Brezillon
2019-10-25 19:58 ` Rob Herring
2019-10-25 19:58 ` Rob Herring
2019-12-02 17:19 ` Laurent Pinchart
2019-10-23 15:45 ` [PATCH v3 21/21] ARM: dts: imx: imx51-zii-rdu1: Fix the display pipeline definition Boris Brezillon
2019-10-24 11:27 ` [PATCH v3 00/21] drm: Add support for bus-format negotiation Neil Armstrong
2019-10-24 13:22 ` Boris Brezillon
2019-11-24 0:46 ` Ezequiel Garcia
2019-11-24 0:46 ` Ezequiel Garcia
2019-11-24 7:32 ` Boris Brezillon
2019-11-24 9:34 ` Ezequiel Garcia
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191202165746.GO4929@pendragon.ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=andrew.smirnov@gmail.com \
--cc=boris.brezillon@collabora.com \
--cc=cphealy@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=jernej.skrabec@siol.net \
--cc=jonas@kwiboo.se \
--cc=kernel@collabora.com \
--cc=kyungmin.park@samsung.com \
--cc=mark.rutland@arm.com \
--cc=narmstrong@baylibre.com \
--cc=nikita.yoush@cogentembedded.com \
--cc=robh+dt@kernel.org \
--cc=sam@ravnborg.org \
--cc=sw0312.kim@samsung.com \
--cc=thierry.reding@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox