* [PATCH] drm/sun4i: fix missing component unbind on bind errors
@ 2023-03-06 10:32 Johan Hovold
2023-03-07 15:29 ` (subset) " Maxime Ripard
0 siblings, 1 reply; 2+ messages in thread
From: Johan Hovold @ 2023-03-06 10:32 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai
Cc: David Airlie, Daniel Vetter, Jernej Skrabec, Samuel Holland,
Boris Brezillon, dri-devel, linux-arm-kernel, linux-sunxi,
linux-kernel, Johan Hovold, stable
Make sure to unbind all subcomponents when binding the aggregate device
fails.
Fixes: 9026e0d122ac ("drm: Add Allwinner A10 Display Engine support")
Cc: stable@vger.kernel.org # 4.7
Cc: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
Note that this one has only been compile tested.
Johan
drivers/gpu/drm/sun4i/sun4i_drv.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
index cc94efbbf2d4..d6c741716167 100644
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@ -95,12 +95,12 @@ static int sun4i_drv_bind(struct device *dev)
/* drm_vblank_init calls kcalloc, which can fail */
ret = drm_vblank_init(drm, drm->mode_config.num_crtc);
if (ret)
- goto cleanup_mode_config;
+ goto unbind_all;
/* Remove early framebuffers (ie. simplefb) */
ret = drm_aperture_remove_framebuffers(false, &sun4i_drv_driver);
if (ret)
- goto cleanup_mode_config;
+ goto unbind_all;
sun4i_framebuffer_init(drm);
@@ -119,6 +119,8 @@ static int sun4i_drv_bind(struct device *dev)
finish_poll:
drm_kms_helper_poll_fini(drm);
+unbind_all:
+ component_unbind_all(dev, NULL);
cleanup_mode_config:
drm_mode_config_cleanup(drm);
of_reserved_mem_device_release(dev);
--
2.39.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: (subset) [PATCH] drm/sun4i: fix missing component unbind on bind errors
2023-03-06 10:32 [PATCH] drm/sun4i: fix missing component unbind on bind errors Johan Hovold
@ 2023-03-07 15:29 ` Maxime Ripard
0 siblings, 0 replies; 2+ messages in thread
From: Maxime Ripard @ 2023-03-07 15:29 UTC (permalink / raw)
To: Maxime Ripard, Chen-Yu Tsai, Johan Hovold
Cc: David Airlie, Daniel Vetter, Jernej Skrabec, Samuel Holland,
Boris Brezillon, dri-devel, linux-arm-kernel, linux-sunxi,
linux-kernel, stable
On Mon, 06 Mar 2023 11:32:42 +0100, Johan Hovold wrote:
> Make sure to unbind all subcomponents when binding the aggregate device
> fails.
>
>
Applied to drm/drm-misc (drm-misc-fixes).
Thanks!
Maxime
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-03-07 15:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-06 10:32 [PATCH] drm/sun4i: fix missing component unbind on bind errors Johan Hovold
2023-03-07 15:29 ` (subset) " Maxime Ripard
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).