* [PATCH] drm/meson: fix missing component unbind on bind errors
@ 2023-03-06 10:35 Johan Hovold
2023-03-09 21:41 ` Martin Blumenstingl
2023-03-22 17:03 ` Neil Armstrong
0 siblings, 2 replies; 6+ messages in thread
From: Johan Hovold @ 2023-03-06 10:35 UTC (permalink / raw)
To: Neil Armstrong
Cc: David Airlie, Daniel Vetter, Kevin Hilman, Jerome Brunet,
Martin Blumenstingl, dri-devel, linux-amlogic, linux-arm-kernel,
linux-kernel, Johan Hovold, stable
Make sure to unbind all subcomponents when binding the aggregate device
fails.
Fixes: a41e82e6c457 ("drm/meson: Add support for components")
Cc: stable@vger.kernel.org # 4.12
Cc: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
Note that this one has only been compile tested.
Johan
drivers/gpu/drm/meson/meson_drv.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index 79bfe3938d3c..7caf937c3c90 100644
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -325,23 +325,23 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
ret = meson_encoder_hdmi_init(priv);
if (ret)
- goto exit_afbcd;
+ goto unbind_all;
ret = meson_plane_create(priv);
if (ret)
- goto exit_afbcd;
+ goto unbind_all;
ret = meson_overlay_create(priv);
if (ret)
- goto exit_afbcd;
+ goto unbind_all;
ret = meson_crtc_create(priv);
if (ret)
- goto exit_afbcd;
+ goto unbind_all;
ret = request_irq(priv->vsync_irq, meson_irq, 0, drm->driver->name, drm);
if (ret)
- goto exit_afbcd;
+ goto unbind_all;
drm_mode_config_reset(drm);
@@ -359,6 +359,9 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
uninstall_irq:
free_irq(priv->vsync_irq, drm);
+unbind_all:
+ if (has_components)
+ component_unbind_all(drm->dev, drm);
exit_afbcd:
if (priv->afbcd.ops)
priv->afbcd.ops->exit(priv);
--
2.39.2
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] drm/meson: fix missing component unbind on bind errors
2023-03-06 10:35 [PATCH] drm/meson: fix missing component unbind on bind errors Johan Hovold
@ 2023-03-09 21:41 ` Martin Blumenstingl
2023-03-21 13:14 ` Johan Hovold
2023-03-22 17:03 ` Neil Armstrong
1 sibling, 1 reply; 6+ messages in thread
From: Martin Blumenstingl @ 2023-03-09 21:41 UTC (permalink / raw)
To: Johan Hovold, Neil Armstrong
Cc: David Airlie, Daniel Vetter, Kevin Hilman, Jerome Brunet,
dri-devel, linux-amlogic, linux-arm-kernel, linux-kernel, stable
Hi Johan,
thanks for your patch!
On Mon, Mar 6, 2023 at 11:35 AM Johan Hovold <johan+linaro@kernel.org> wrote:
[...]
> @@ -325,23 +325,23 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
>
> ret = meson_encoder_hdmi_init(priv);
I'm wondering if component_bind_all() can be moved further down.
Right now it's between meson_encoder_cvbs_init() and
meson_encoder_hdmi_init(). So it seems that encoders don't rely on
component registration.
Unfortunately I am also not familiar with this and I'm hoping that
Neil can comment on this.
Best regards,
Martin
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/meson: fix missing component unbind on bind errors
2023-03-09 21:41 ` Martin Blumenstingl
@ 2023-03-21 13:14 ` Johan Hovold
2023-03-21 13:27 ` Neil Armstrong
0 siblings, 1 reply; 6+ messages in thread
From: Johan Hovold @ 2023-03-21 13:14 UTC (permalink / raw)
To: Martin Blumenstingl, Neil Armstrong
Cc: Johan Hovold, David Airlie, Daniel Vetter, Kevin Hilman,
Jerome Brunet, dri-devel, linux-amlogic, linux-arm-kernel,
linux-kernel, stable
On Thu, Mar 09, 2023 at 10:41:18PM +0100, Martin Blumenstingl wrote:
> On Mon, Mar 6, 2023 at 11:35 AM Johan Hovold <johan+linaro@kernel.org> wrote:
> [...]
> > @@ -325,23 +325,23 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
> >
> > ret = meson_encoder_hdmi_init(priv);
> I'm wondering if component_bind_all() can be moved further down.
> Right now it's between meson_encoder_cvbs_init() and
> meson_encoder_hdmi_init(). So it seems that encoders don't rely on
> component registration.
Perhaps it can, but that would be a separate change (unless there is
something inherently wrong with the current initialisation order).
> Unfortunately I am also not familiar with this and I'm hoping that
> Neil can comment on this.
Any comments on this one, Neil?
Johan
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/meson: fix missing component unbind on bind errors
2023-03-21 13:14 ` Johan Hovold
@ 2023-03-21 13:27 ` Neil Armstrong
2023-03-21 13:33 ` Johan Hovold
0 siblings, 1 reply; 6+ messages in thread
From: Neil Armstrong @ 2023-03-21 13:27 UTC (permalink / raw)
To: Johan Hovold, Martin Blumenstingl
Cc: Johan Hovold, David Airlie, Daniel Vetter, Kevin Hilman,
Jerome Brunet, dri-devel, linux-amlogic, linux-arm-kernel,
linux-kernel, stable
On 21/03/2023 14:14, Johan Hovold wrote:
> On Thu, Mar 09, 2023 at 10:41:18PM +0100, Martin Blumenstingl wrote:
>
>> On Mon, Mar 6, 2023 at 11:35 AM Johan Hovold <johan+linaro@kernel.org> wrote:
>> [...]
>>> @@ -325,23 +325,23 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
>>>
>>> ret = meson_encoder_hdmi_init(priv);
>
>> I'm wondering if component_bind_all() can be moved further down.
>> Right now it's between meson_encoder_cvbs_init() and
>> meson_encoder_hdmi_init(). So it seems that encoders don't rely on
>> component registration.
>
> Perhaps it can, but that would be a separate change (unless there is
> something inherently wrong with the current initialisation order).
The CVBS doesn't rely on any components unlike HDMI, this explains the
current position of component_bind_all().
>
>> Unfortunately I am also not familiar with this and I'm hoping that
>> Neil can comment on this.
>
> Any comments on this one, Neil?
Yep, components should be bind for HDMI encoder/bridge init.
Anyway for this patch, sorry for the delay, but it's looks fine:
Acked-by: Neil Armstrong <neil.armstrong@linaro.org>
>
> Johan
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/meson: fix missing component unbind on bind errors
2023-03-21 13:27 ` Neil Armstrong
@ 2023-03-21 13:33 ` Johan Hovold
0 siblings, 0 replies; 6+ messages in thread
From: Johan Hovold @ 2023-03-21 13:33 UTC (permalink / raw)
To: Neil Armstrong
Cc: Martin Blumenstingl, Johan Hovold, David Airlie, Daniel Vetter,
Kevin Hilman, Jerome Brunet, dri-devel, linux-amlogic,
linux-arm-kernel, linux-kernel, stable
On Tue, Mar 21, 2023 at 02:27:08PM +0100, Neil Armstrong wrote:
> Anyway for this patch, sorry for the delay, but it's looks fine:
>
> Acked-by: Neil Armstrong <neil.armstrong@linaro.org>
Thanks for reviewing!
Johan
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/meson: fix missing component unbind on bind errors
2023-03-06 10:35 [PATCH] drm/meson: fix missing component unbind on bind errors Johan Hovold
2023-03-09 21:41 ` Martin Blumenstingl
@ 2023-03-22 17:03 ` Neil Armstrong
1 sibling, 0 replies; 6+ messages in thread
From: Neil Armstrong @ 2023-03-22 17:03 UTC (permalink / raw)
To: Johan Hovold
Cc: David Airlie, Daniel Vetter, Kevin Hilman, Jerome Brunet,
Martin Blumenstingl, dri-devel, linux-amlogic, linux-arm-kernel,
linux-kernel, stable
Hi,
On Mon, 06 Mar 2023 11:35:33 +0100, Johan Hovold wrote:
> Make sure to unbind all subcomponents when binding the aggregate device
> fails.
>
>
Thanks, Applied to https://anongit.freedesktop.org/git/drm/drm-misc.git (drm-misc-fixes)
[1/1] drm/meson: fix missing component unbind on bind errors
https://cgit.freedesktop.org/drm/drm-misc/commit/?id=ba98413bf45edbf33672e2539e321b851b2cfbd1
--
Neil
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-03-22 17:03 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-06 10:35 [PATCH] drm/meson: fix missing component unbind on bind errors Johan Hovold
2023-03-09 21:41 ` Martin Blumenstingl
2023-03-21 13:14 ` Johan Hovold
2023-03-21 13:27 ` Neil Armstrong
2023-03-21 13:33 ` Johan Hovold
2023-03-22 17:03 ` Neil Armstrong
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).