From: "Heiko Stübner" <heiko@sntech.de>
To: dri-devel@lists.freedesktop.org, Sascha Hauer <s.hauer@pengutronix.de>
Cc: linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org,
kernel@pengutronix.de, Andy Yan <andy.yan@rock-chips.com>,
Benjamin Gaignard <benjamin.gaignard@collabora.com>,
Michael Riesch <michael.riesch@wolfvision.net>,
Sandy Huang <hjc@rock-chips.com>,
Peter Geis <pgwipeout@gmail.com>,
Sascha Hauer <s.hauer@pengutronix.de>
Subject: Re: [PATCH v5 02/23] drm/rockchip: dw_hdmi: Do not leave clock enabled in error case
Date: Wed, 09 Feb 2022 11:03:58 +0100 [thread overview]
Message-ID: <2395553.0l50XtO9Ib@diego> (raw)
In-Reply-To: <20220209095350.2104049-3-s.hauer@pengutronix.de>
Am Mittwoch, 9. Februar 2022, 10:53:29 CET schrieb Sascha Hauer:
> The driver returns an error when devm_phy_optional_get() fails leaving
> the previously enabled clock turned on. Change order and enable the
> clock only after the phy has been acquired.
>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
just a note for me, already applied to drm-misc-fixes:
https://cgit.freedesktop.org/drm/drm-misc/commit/?h=drm-misc-fixes&id=c0cfbb122275da1b726481de5a8cffeb24e6322b
> ---
> drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
> index 830bdd5e9b7c..8677c8271678 100644
> --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
> +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
> @@ -529,13 +529,6 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
> return ret;
> }
>
> - ret = clk_prepare_enable(hdmi->vpll_clk);
> - if (ret) {
> - DRM_DEV_ERROR(hdmi->dev, "Failed to enable HDMI vpll: %d\n",
> - ret);
> - return ret;
> - }
> -
> hdmi->phy = devm_phy_optional_get(dev, "hdmi");
> if (IS_ERR(hdmi->phy)) {
> ret = PTR_ERR(hdmi->phy);
> @@ -544,6 +537,13 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
> return ret;
> }
>
> + ret = clk_prepare_enable(hdmi->vpll_clk);
> + if (ret) {
> + DRM_DEV_ERROR(hdmi->dev, "Failed to enable HDMI vpll: %d\n",
> + ret);
> + return ret;
> + }
> +
> drm_encoder_helper_add(encoder, &dw_hdmi_rockchip_encoder_helper_funcs);
> drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS);
>
>
next prev parent reply other threads:[~2022-02-09 11:10 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-09 9:53 [PATCH v5 00/23] drm/rockchip: RK356x VOP2 support Sascha Hauer
2022-02-09 9:53 ` [PATCH v5 01/23] drm/encoder: Add of_graph port to struct drm_encoder Sascha Hauer
2022-02-09 10:07 ` Sascha Hauer
2022-02-09 11:12 ` Jani Nikula
2022-02-10 11:52 ` Sascha Hauer
2022-02-10 15:22 ` Sascha Hauer
2022-02-09 9:53 ` [PATCH v5 02/23] drm/rockchip: dw_hdmi: Do not leave clock enabled in error case Sascha Hauer
2022-02-09 10:03 ` Heiko Stübner [this message]
2022-02-09 9:53 ` [PATCH v5 03/23] drm/rockchip: dw_hdmi: rename vpll clock to reference clock Sascha Hauer
2022-02-09 9:53 ` [PATCH v5 04/23] dt-bindings: display: rockchip: dw-hdmi: use "ref" as clock name Sascha Hauer
2022-02-09 9:53 ` [PATCH v5 05/23] arm64: dts: rockchip: rk3399: rename HDMI ref clock to 'ref' Sascha Hauer
2022-02-09 9:53 ` [PATCH v5 06/23] drm/rockchip: dw_hdmi: add rk3568 support Sascha Hauer
2022-02-09 9:53 ` [PATCH v5 07/23] dt-bindings: display: rockchip: dw-hdmi: Add compatible for rk3568 HDMI Sascha Hauer
2022-02-09 9:53 ` [PATCH v5 08/23] drm/rockchip: dw_hdmi: add regulator support Sascha Hauer
2022-02-09 9:53 ` [PATCH v5 09/23] dt-bindings: display: rockchip: dw-hdmi: Add " Sascha Hauer
2022-02-09 9:53 ` [PATCH v5 10/23] drm/rockchip: dw_hdmi: Add support for hclk Sascha Hauer
2022-02-15 19:50 ` Dmitry Osipenko
2022-02-09 9:53 ` [PATCH v5 11/23] dt-bindings: display: rockchip: dw-hdmi: Add additional clock Sascha Hauer
2022-02-09 9:53 ` [PATCH v5 12/23] drm/rockchip: dw_hdmi: Use auto-generated tables Sascha Hauer
2022-02-09 10:06 ` Heiko Stübner
2022-02-09 9:53 ` [PATCH v5 13/23] drm/rockchip: dw_hdmi: drop mode_valid hook Sascha Hauer
2022-02-09 9:53 ` [PATCH v5 14/23] drm/rockchip: dw_hdmi: Set cur_ctr to 0 always Sascha Hauer
2022-02-09 9:53 ` [PATCH v5 15/23] drm/rockchip: dw_hdmi: add default 594Mhz clk for 4K@60hz Sascha Hauer
2022-02-09 9:53 ` [PATCH v5 16/23] dt-bindings: display: rockchip: dw-hdmi: Make unwedge pinctrl optional Sascha Hauer
2022-02-09 9:53 ` [PATCH v5 17/23] arm64: dts: rockchip: rk356x: Add VOP2 nodes Sascha Hauer
2022-02-09 9:53 ` [PATCH v5 18/23] arm64: dts: rockchip: rk356x: Add HDMI nodes Sascha Hauer
2022-02-09 9:53 ` [PATCH v5 19/23] arm64: dts: rockchip: rk3568-evb: Enable VOP2 and hdmi Sascha Hauer
2022-02-10 0:10 ` Johan Jonker
2022-02-10 11:47 ` Sascha Hauer
2022-02-10 13:15 ` Johan Jonker
2022-02-10 13:37 ` Sascha Hauer
2022-02-10 13:51 ` Heiko Stübner
2022-02-09 9:53 ` [PATCH v5 20/23] arm64: dts: rockchip: enable vop2 and hdmi tx on quartz64a Sascha Hauer
2022-02-09 9:53 ` [PATCH v5 21/23] drm/rockchip: Make VOP driver optional Sascha Hauer
2022-02-09 9:53 ` [PATCH v5 22/23] drm: rockchip: Add VOP2 driver Sascha Hauer
2022-02-09 20:13 ` Aw: " Frank Wunderlich
2022-02-10 6:50 ` Michael Riesch
2022-02-15 19:47 ` Dmitry Osipenko
2022-02-15 19:47 ` Dmitry Osipenko
2022-02-15 19:47 ` Dmitry Osipenko
2022-02-16 10:39 ` Dmitry Osipenko
2022-02-16 11:22 ` Sascha Hauer
2022-02-16 12:23 ` Dmitry Osipenko
2022-02-09 9:53 ` [PATCH v5 23/23] dt-bindings: display: rockchip: Add binding for VOP2 Sascha Hauer
2022-02-09 18:56 ` Rob Herring
2022-02-09 17:44 ` Aw: [PATCH v5 00/23] drm/rockchip: RK356x VOP2 support Frank Wunderlich
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=2395553.0l50XtO9Ib@diego \
--to=heiko@sntech.de \
--cc=andy.yan@rock-chips.com \
--cc=benjamin.gaignard@collabora.com \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=hjc@rock-chips.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=michael.riesch@wolfvision.net \
--cc=pgwipeout@gmail.com \
--cc=s.hauer@pengutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).