| Message ID | 20201120094205.525228-3-maz@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Neil Armstrong |
| Headers | show |
| Series | More meson HDMI fixes | expand |
On 20/11/2020 09: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> Although I am triaging kernelci bisections, it was initially found thanks to our friendly bot. So if you're OK with this, it would most definitely appreciate a mention: Reported-by: "kernelci.org bot" <bot@kernelci.org> Thanks, Guillaume
On 2020-11-20 10:54, Guillaume Tucker wrote: > On 20/11/2020 09: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> > > Although I am triaging kernelci bisections, it was initially > found thanks to our friendly bot. So if you're OK with this, it > would most definitely appreciate a mention: > > Reported-by: "kernelci.org bot" <bot@kernelci.org> Sure. Neil can add this when (and if) he applies these patches. Thanks, M.
On 20/11/2020 12:10, Marc Zyngier wrote: > On 2020-11-20 10:54, Guillaume Tucker wrote: >> On 20/11/2020 09: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> >> >> Although I am triaging kernelci bisections, it was initially >> found thanks to our friendly bot. So if you're OK with this, it >> would most definitely appreciate a mention: >> >> Reported-by: "kernelci.org bot" <bot@kernelci.org> > > Sure. Neil can add this when (and if) he applies these patches. Yep applying to drm-misc-next and switching to `Reported-by: "kernelci.org bot" <bot@kernelci.org>` Thanks Neil > > Thanks, > > M.
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>
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,
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(-)