From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66A81C432C0 for ; Sun, 24 Nov 2019 10:39:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 10EA92071A for ; Sun, 24 Nov 2019 10:39:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="fsE7ERbC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726090AbfKXKjj (ORCPT ); Sun, 24 Nov 2019 05:39:39 -0500 Received: from perceval.ideasonboard.com ([213.167.242.64]:36274 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725980AbfKXKjj (ORCPT ); Sun, 24 Nov 2019 05:39:39 -0500 Received: from pendragon.ideasonboard.com (fs96f9c64d.tkyc509.ap.nuro.jp [150.249.198.77]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 037D2A38; Sun, 24 Nov 2019 11:39:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1574591975; bh=5JwPvNLq/IJN6f7/QPyvWwfM917S/EUR0MxLWuscyQc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=fsE7ERbCMX6r4xwaWKObPIcLEXk2F/1e91GVDzoRmUYw6W/qHaixM6qmwHzPW8JsP 9UrXA4VQB6sK+COJvponL3YIBwiAniGX7HTybotpsvkxPOPZrqrqauj2Mq9ZRvQUCb zwOJUQaLnJY+Cfo4pEfc+NU/zCcGd3jjPyZCLynE= Date: Sun, 24 Nov 2019 12:39:26 +0200 From: Laurent Pinchart To: Boris Brezillon Cc: dri-devel@lists.freedesktop.org, Lucas Stach , Chris Healy , Andrey Smirnov , Nikita Yushchenko , kernel@collabora.com, Daniel Vetter , Inki Dae , Joonyoung Shim , Seung-Woo Kim , Kyungmin Park , Thierry Reding , Sam Ravnborg , Philipp Zabel , Rob Clark , Andrzej Hajda , Neil Armstrong , Jonas Karlman , Jernej Skrabec , Rob Herring , Mark Rutland , devicetree@vger.kernel.org Subject: Re: [PATCH v3 06/21] drm: Stop accessing encoder->bridge directly Message-ID: <20191124103926.GG4727@pendragon.ideasonboard.com> References: <20191023154512.9762-1-boris.brezillon@collabora.com> <20191023154512.9762-7-boris.brezillon@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20191023154512.9762-7-boris.brezillon@collabora.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Hi Boris, Thank you for the patch. On Wed, Oct 23, 2019 at 05:44:57PM +0200, Boris Brezillon wrote: > We are about to replace the single-linked bridge list by a double-linked > one based on list.h, leading to the suppression of the encoder->bridge > field. But before we can do that we must provide a > drm_bridge_chain_get_first_bridge() bridge helper and patch all drivers > and core helpers to use it instead of directly accessing encoder->bridge. > > Signed-off-by: Boris Brezillon > --- > drivers/gpu/drm/drm_atomic_helper.c | 25 +++++++++++++++++-------- > drivers/gpu/drm/drm_encoder.c | 3 ++- > drivers/gpu/drm/drm_probe_helper.c | 4 +++- > drivers/gpu/drm/msm/edp/edp_bridge.c | 10 ++++++++-- > drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 11 ++++++++--- > include/drm/drm_bridge.h | 15 +++++++++++++++ > 6 files changed, 53 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > index cf678be58fa4..f02ddffd4960 100644 > --- a/drivers/gpu/drm/drm_atomic_helper.c > +++ b/drivers/gpu/drm/drm_atomic_helper.c > @@ -419,6 +419,7 @@ mode_fixup(struct drm_atomic_state *state) > for_each_new_connector_in_state(state, connector, new_conn_state, i) { > const struct drm_encoder_helper_funcs *funcs; > struct drm_encoder *encoder; > + struct drm_bridge *bridge; > > WARN_ON(!!new_conn_state->best_encoder != !!new_conn_state->crtc); > > @@ -435,7 +436,8 @@ mode_fixup(struct drm_atomic_state *state) > encoder = new_conn_state->best_encoder; > funcs = encoder->helper_private; > > - ret = drm_bridge_chain_mode_fixup(encoder->bridge, > + bridge = drm_bridge_chain_get_first_bridge(encoder); > + ret = drm_bridge_chain_mode_fixup(bridge, > &new_crtc_state->mode, > &new_crtc_state->adjusted_mode); > if (!ret) { > @@ -493,6 +495,7 @@ static enum drm_mode_status mode_valid_path(struct drm_connector *connector, > struct drm_crtc *crtc, > const struct drm_display_mode *mode) > { > + struct drm_bridge *bridge; > enum drm_mode_status ret; > > ret = drm_encoder_mode_valid(encoder, mode); > @@ -502,7 +505,8 @@ static enum drm_mode_status mode_valid_path(struct drm_connector *connector, > return ret; > } > > - ret = drm_bridge_chain_mode_valid(encoder->bridge, mode); > + bridge = drm_bridge_chain_get_first_bridge(encoder); > + ret = drm_bridge_chain_mode_valid(bridge, mode); > if (ret != MODE_OK) { > DRM_DEBUG_ATOMIC("[BRIDGE] mode_valid() failed\n"); > return ret; > @@ -985,6 +989,7 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) > for_each_oldnew_connector_in_state(old_state, connector, old_conn_state, new_conn_state, i) { > const struct drm_encoder_helper_funcs *funcs; > struct drm_encoder *encoder; > + struct drm_bridge *bridge; > > /* Shut down everything that's in the changeset and currently > * still on. So need to check the old, saved state. */ > @@ -1021,7 +1026,8 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) > * Each encoder has at most one connector (since we always steal > * it away), so we won't call disable hooks twice. > */ > - drm_atomic_bridge_chain_disable(encoder->bridge, old_state); > + bridge = drm_bridge_chain_get_first_bridge(encoder); > + drm_atomic_bridge_chain_disable(bridge, old_state); > > /* Right function depends upon target state. */ > if (funcs) { > @@ -1035,7 +1041,7 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) > funcs->dpms(encoder, DRM_MODE_DPMS_OFF); > } > > - drm_atomic_bridge_chain_post_disable(encoder->bridge, > + drm_atomic_bridge_chain_post_disable(bridge, > old_state); This now fits on a single line. > } > > @@ -1190,6 +1196,7 @@ crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state) > const struct drm_encoder_helper_funcs *funcs; > struct drm_encoder *encoder; > struct drm_display_mode *mode, *adjusted_mode; > + struct drm_bridge *bridge; > > if (!new_conn_state->best_encoder) > continue; > @@ -1217,8 +1224,8 @@ crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state) > funcs->mode_set(encoder, mode, adjusted_mode); > } > > - drm_bridge_chain_mode_set(encoder->bridge, mode, > - adjusted_mode); > + bridge = drm_bridge_chain_get_first_bridge(encoder); > + drm_bridge_chain_mode_set(bridge, mode, adjusted_mode); > } > } > > @@ -1317,6 +1324,7 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, > for_each_new_connector_in_state(old_state, connector, new_conn_state, i) { > const struct drm_encoder_helper_funcs *funcs; > struct drm_encoder *encoder; > + struct drm_bridge *bridge; > > if (!new_conn_state->best_encoder) > continue; > @@ -1335,7 +1343,8 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, > * Each encoder has at most one connector (since we always steal > * it away), so we won't call enable hooks twice. > */ > - drm_atomic_bridge_chain_pre_enable(encoder->bridge, old_state); > + bridge = drm_bridge_chain_get_first_bridge(encoder); > + drm_atomic_bridge_chain_pre_enable(bridge, old_state); > > if (funcs) { > if (funcs->atomic_enable) > @@ -1346,7 +1355,7 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, > funcs->commit(encoder); > } > > - drm_atomic_bridge_chain_enable(encoder->bridge, old_state); > + drm_atomic_bridge_chain_enable(bridge, old_state); > } > > drm_atomic_helper_commit_writebacks(dev, old_state); > diff --git a/drivers/gpu/drm/drm_encoder.c b/drivers/gpu/drm/drm_encoder.c > index 80d88a55302e..4fe9e723e227 100644 > --- a/drivers/gpu/drm/drm_encoder.c > +++ b/drivers/gpu/drm/drm_encoder.c > @@ -167,9 +167,10 @@ void drm_encoder_cleanup(struct drm_encoder *encoder) > */ > > if (encoder->bridge) { > - struct drm_bridge *bridge = encoder->bridge; > + struct drm_bridge *bridge; > struct drm_bridge *next; > > + bridge = drm_bridge_chain_get_first_bridge(encoder); > while (bridge) { > next = bridge->next; Shouldn't this have been addressed in the previous patch ? > drm_bridge_detach(bridge); > diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c > index c3ea722065c4..576b4b7dcd89 100644 > --- a/drivers/gpu/drm/drm_probe_helper.c > +++ b/drivers/gpu/drm/drm_probe_helper.c > @@ -101,6 +101,7 @@ drm_mode_validate_pipeline(struct drm_display_mode *mode, > > /* Step 2: Validate against encoders and crtcs */ > drm_connector_for_each_possible_encoder(connector, encoder) { > + struct drm_bridge *bridge; > struct drm_crtc *crtc; > > ret = drm_encoder_mode_valid(encoder, mode); > @@ -112,7 +113,8 @@ drm_mode_validate_pipeline(struct drm_display_mode *mode, > continue; > } > > - ret = drm_bridge_chain_mode_valid(encoder->bridge, mode); > + bridge = drm_bridge_chain_get_first_bridge(encoder); > + ret = drm_bridge_chain_mode_valid(bridge, mode); > if (ret != MODE_OK) { > /* There is also no point in continuing for crtc check > * here. */ > diff --git a/drivers/gpu/drm/msm/edp/edp_bridge.c b/drivers/gpu/drm/msm/edp/edp_bridge.c > index 2950bba4aca9..b65b5cc2dba2 100644 > --- a/drivers/gpu/drm/msm/edp/edp_bridge.c > +++ b/drivers/gpu/drm/msm/edp/edp_bridge.c > @@ -55,8 +55,14 @@ static void edp_bridge_mode_set(struct drm_bridge *bridge, > DBG("set mode: " DRM_MODE_FMT, DRM_MODE_ARG(mode)); > > list_for_each_entry(connector, &dev->mode_config.connector_list, head) { > - if ((connector->encoder != NULL) && > - (connector->encoder->bridge == bridge)) { > + struct drm_encoder *encoder = connector->encoder; > + struct drm_bridge *first_bridge; > + > + if (!connector->encoder) > + continue; > + > + first_bridge = drm_bridge_chain_get_first_bridge(encoder); > + if (bridge == first_bridge) { > msm_edp_ctrl_timing_cfg(edp->ctrl, > adjusted_mode, &connector->display_info); > break; > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c > index 2da46e3dc4ae..7a1f1e5f0326 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c > @@ -14,6 +14,7 @@ > > #include > #include > +#include > #include > #include > #include > @@ -680,9 +681,10 @@ static void rcar_du_crtc_atomic_enable(struct drm_crtc *crtc, > rcdu->encoders[RCAR_DU_OUTPUT_LVDS0 + rcrtc->index]; > const struct drm_display_mode *mode = > &crtc->state->adjusted_mode; > + struct drm_bridge *bridge; > > - rcar_lvds_clk_enable(encoder->base.bridge, > - mode->clock * 1000); > + bridge = drm_bridge_chain_get_first_bridge(&encoder->base); > + rcar_lvds_clk_enable(bridge, mode->clock * 1000); > } > > rcar_du_crtc_start(rcrtc); > @@ -702,12 +704,15 @@ static void rcar_du_crtc_atomic_disable(struct drm_crtc *crtc, > rstate->outputs == BIT(RCAR_DU_OUTPUT_DPAD0)) { > struct rcar_du_encoder *encoder = > rcdu->encoders[RCAR_DU_OUTPUT_LVDS0 + rcrtc->index]; > + struct drm_bridge *bridge; > + Extra blank line. With those small issues fixed, Reviewed-by: Laurent Pinchart > > /* > * Disable the LVDS clock output, see > * rcar_du_crtc_atomic_enable(). > */ > - rcar_lvds_clk_disable(encoder->base.bridge); > + bridge = drm_bridge_chain_get_first_bridge(&encoder->base); > + rcar_lvds_clk_disable(bridge); > } > > spin_lock_irq(&crtc->dev->event_lock); > diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h > index 8aeba83fcf31..27eef63ce0ff 100644 > --- a/include/drm/drm_bridge.h > +++ b/include/drm/drm_bridge.h > @@ -25,6 +25,7 @@ > > #include > #include > +#include > #include > #include > > @@ -422,6 +423,20 @@ drm_bridge_chain_get_next_bridge(struct drm_bridge *bridge) > return bridge->next; > } > > +/** > + * drm_bridge_chain_get_first_bridge() - Get the first bridge in the chain > + * @encoder: encoder object > + * > + * RETURNS: > + * the first bridge in the chain, or NULL if @encoder has no bridge attached > + * to it. > + */ > +static inline struct drm_bridge * > +drm_bridge_chain_get_first_bridge(struct drm_encoder *encoder) > +{ > + return encoder->bridge; > +} > + > bool drm_bridge_chain_mode_fixup(struct drm_bridge *bridge, > const struct drm_display_mode *mode, > struct drm_display_mode *adjusted_mode); -- Regards, Laurent Pinchart