From: Neil Armstrong <narmstrong@baylibre.com>
To: Marc Zyngier <maz@kernel.org>, Kevin Hilman <khilman@baylibre.com>
Cc: Jerome Brunet <jbrunet@baylibre.com>,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
Guillaume Tucker <guillaume.tucker@collabora.com>,
kernel-team@android.com, dri-devel@lists.freedesktop.org,
linux-amlogic@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] drm/meson: dw-hdmi: Enable the iahb clock early enough
Date: Fri, 20 Nov 2020 13:27:07 +0100 [thread overview]
Message-ID: <efcccf79-9ec2-30c1-2df8-73f2cbfd0cd2@baylibre.com> (raw)
In-Reply-To: <20201120094205.525228-3-maz@kernel.org>
On 20/11/2020 10:42, Marc Zyngier wrote:
> Instead of moving meson_dw_hdmi_init() around which breaks existing
> platform, let's enable the clock meson_dw_hdmi_init() depends on.
> This means we don't have to worry about this clock being enabled or
> not, depending on the boot-loader features.
>
> Fixes: b33340e33acd ("drm/meson: dw-hdmi: Ensure that clocks are enabled before touching the TOP registers")
> Reported-by: Guillaume Tucker <guillaume.tucker@collabora.com>
> Tested-by: Guillaume Tucker <guillaume.tucker@collabora.com>
> Signed-off-by: Marc Zyngier <maz@kernel.org>
> ---
> drivers/gpu/drm/meson/meson_dw_hdmi.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c
> index 29623b309cb1..aad75a22dc33 100644
> --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c
> +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c
> @@ -1051,6 +1051,10 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,
> if (ret)
> return ret;
>
> + ret = meson_enable_clk(dev, "iahb");
> + if (ret)
> + return ret;
> +
> ret = meson_enable_clk(dev, "venci");
> if (ret)
> return ret;
> @@ -1086,6 +1090,8 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,
>
> encoder->possible_crtcs = BIT(0);
>
> + meson_dw_hdmi_init(meson_dw_hdmi);
> +
> DRM_DEBUG_DRIVER("encoder initialized\n");
>
> /* Bridge / Connector */
> @@ -1110,8 +1116,6 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,
> if (IS_ERR(meson_dw_hdmi->hdmi))
> return PTR_ERR(meson_dw_hdmi->hdmi);
>
> - meson_dw_hdmi_init(meson_dw_hdmi);
> -
> next_bridge = of_drm_find_bridge(pdev->dev.of_node);
> if (next_bridge)
> drm_bridge_attach(encoder, next_bridge,
>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
prev parent reply other threads:[~2020-11-20 12:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-20 9:42 [PATCH 0/2] More meson HDMI fixes Marc Zyngier
2020-11-20 9:42 ` [PATCH 1/2] drm/meson: dw-hdmi: Disable clocks on driver teardown Marc Zyngier
2020-11-20 12:26 ` Neil Armstrong
2020-11-23 14:03 ` Jerome Brunet
2020-11-23 14:15 ` Marc Zyngier
2020-11-20 9:42 ` [PATCH 2/2] drm/meson: dw-hdmi: Enable the iahb clock early enough Marc Zyngier
2020-11-20 10:54 ` Guillaume Tucker
2020-11-20 11:10 ` Marc Zyngier
2020-11-20 12:18 ` Neil Armstrong
2020-11-20 12:27 ` Neil Armstrong [this message]
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=efcccf79-9ec2-30c1-2df8-73f2cbfd0cd2@baylibre.com \
--to=narmstrong@baylibre.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=guillaume.tucker@collabora.com \
--cc=jbrunet@baylibre.com \
--cc=kernel-team@android.com \
--cc=khilman@baylibre.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.blumenstingl@googlemail.com \
--cc=maz@kernel.org \
/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).