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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF4D3C7EE21 for ; Tue, 2 May 2023 12:05:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234101AbjEBMFy (ORCPT ); Tue, 2 May 2023 08:05:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229722AbjEBMFw (ORCPT ); Tue, 2 May 2023 08:05:52 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B01865BA5; Tue, 2 May 2023 05:05:51 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 455196238C; Tue, 2 May 2023 12:05:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93155C4339B; Tue, 2 May 2023 12:05:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683029150; bh=pjosqgAvcJiDE8ocsFRuyjcgaSS47imfs2wX0R23ors=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=mgrMCZV3PZlTUxJtlLltDnGq8PpAFqsf3Cpf9J8cImNxENWE13YAYt/fm9H/81QgF u88v1rhOs2FgynKvqrkMA0JTGOq1ew7Ss4oLmiMy/ZOPctHcROxvgHgFMPogyAk+0g XX/vZPZX9knrHjscuxBRy3Haov7Ie7VvT63/puN6exZ7bQ1ErQQyLxwL1BfZp7Jj5c g5DjbazrYult8Hs3qRBcFFA3js3LEm8CnUj8xfrIB567Ti3whxP5gPqaOCZmHcEIrR Dgc0iaEWGC+GI0KWCIFEWhe1ukMl+RaSO37msxENCVvU1a+SOpL7QDWYME6ijziRv4 qUscBxiY1BjWg== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1ptolV-0003eH-Di; Tue, 02 May 2023 14:05:53 +0200 Date: Tue, 2 May 2023 14:05:53 +0200 From: Johan Hovold To: Bjorn Andersson Cc: Vinod Koul , Kishon Vijay Abraham I , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 5/7] phy: qcom-qmp-combo: Introduce drm_bridge Message-ID: References: <20230425034010.3789376-1-quic_bjorande@quicinc.com> <20230425034010.3789376-6-quic_bjorande@quicinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230425034010.3789376-6-quic_bjorande@quicinc.com> Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Mon, Apr 24, 2023 at 08:40:08PM -0700, Bjorn Andersson wrote: > The QMP combo PHY sits in an of_graph connected between the DisplayPort > controller and a USB Type-C connector (or possibly a redriver). > > The TCPM needs to be able to convey the HPD signal to the DisplayPort > controller, but no directly link is provided by DeviceTree so the signal > needs to "pass through" the QMP combo phy. > > Handle this by introducing a drm_bridge which upon initialization finds > the next bridge (i.e. the usb-c-connector) and chain this together. This > way HPD changes in the connector will propagate to the DisplayPort > driver. > > The connector bridge is resolved lazily, as the TCPM is expected to be > able to resolve the typec mux and switch at probe time, so the QMP combo > phy will probe before the TCPM. > > Signed-off-by: Bjorn Andersson > --- > drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 36 +++++++++++++++++++++++ > 1 file changed, 36 insertions(+) > > diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c > index 5d6d6ef3944b..84bc08002537 100644 > --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c > +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c > @@ -22,6 +22,8 @@ > #include > #include > > +#include > + > #include > > #include "phy-qcom-qmp.h" > @@ -1332,6 +1334,8 @@ struct qmp_combo { > struct clk_hw dp_link_hw; > struct clk_hw dp_pixel_hw; > > + struct drm_bridge bridge; > + > struct typec_switch_dev *sw; > enum typec_orientation orientation; > }; > @@ -3196,6 +3200,34 @@ static int qmp_combo_register_clocks(struct qmp_combo *qmp, struct device_node * > return devm_add_action_or_reset(qmp->dev, phy_clk_release_provider, dp_np); > } > > +static int qmp_combo_bridge_attach(struct drm_bridge *bridge, > + enum drm_bridge_attach_flags flags) > +{ > + struct qmp_combo *qmp = container_of(bridge, struct qmp_combo, bridge); > + struct drm_bridge *next_bridge; > + > + if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) > + return -EINVAL; > + > + next_bridge = devm_drm_of_get_bridge(qmp->dev, qmp->dev->of_node, 0, 0); > + if (IS_ERR(next_bridge)) > + return dev_err_probe(qmp->dev, PTR_ERR(next_bridge), "failed to acquire drm_bridge\n"); Using dev_err_probe() in an attach callback looks wrong as these functions should not be returning -EPROBE_DEFER (and this is not a probe function). > + > + return drm_bridge_attach(bridge->encoder, next_bridge, bridge, DRM_BRIDGE_ATTACH_NO_CONNECTOR); This line is over 100 chars, but there should be no reason not to break it before 80 here. > +} > + > +static const struct drm_bridge_funcs qmp_combo_bridge_funcs = { > + .attach = qmp_combo_bridge_attach, > +}; > + > +static int qmp_combo_dp_register_bridge(struct qmp_combo *qmp) > +{ > + qmp->bridge.funcs = &qmp_combo_bridge_funcs; > + qmp->bridge.of_node = qmp->dev->of_node; > + > + return devm_drm_bridge_add(qmp->dev, &qmp->bridge); > +} Guess you need a dummy function also for qmp_combo_dp_register_bridge() in case of !CONFIG_DRM. > + > static int qmp_combo_parse_dt_lecacy_dp(struct qmp_combo *qmp, struct device_node *np) > { > struct device *dev = qmp->dev; > @@ -3459,6 +3491,10 @@ static int qmp_combo_probe(struct platform_device *pdev) > if (ret) > return ret; > > + ret = qmp_combo_dp_register_bridge(qmp); > + if (ret) > + return ret; > + > /* Check for legacy binding with child nodes. */ > usb_np = of_get_child_by_name(dev->of_node, "usb3-phy"); > if (usb_np) { Johan