This is a note to let you know that I've just added the patch titled
drm/sun4i: fix missing component unbind on bind errors
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-sun4i-fix-missing-component-unbind-on-bind-errors.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From c22f2ff8724b49dce2ae797e9fbf4bc0fa91112f Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
Date: Mon, 6 Mar 2023 11:32:42 +0100
Subject: drm/sun4i: fix missing component unbind on bind errors
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
commit c22f2ff8724b49dce2ae797e9fbf4bc0fa91112f upstream.
Make sure to unbind all subcomponents when binding the aggregate device
fails.
Fixes: 9026e0d122ac ("drm: Add Allwinner A10 Display Engine support")
Cc: stable@xxxxxxxxxxxxxxx # 4.7
Cc: Maxime Ripard <mripard@xxxxxxxxxx>
Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx>
Signed-off-by: Maxime Ripard <maxime@xxxxxxxxxx>
Link: https://patchwork.freedesktop.org/patch/msgid/20230306103242.4775-1-johan+linaro@xxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/sun4i/sun4i_drv.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- 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
/* 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
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);
Patches currently in stable-queue which might be from johan+linaro@xxxxxxxxxx are
queue-6.1/memory-tegra20-emc-fix-interconnect-registration-race.patch
queue-6.1/drm-sun4i-fix-missing-component-unbind-on-bind-errors.patch
queue-6.1/memory-tegra124-emc-fix-interconnect-registration-race.patch
queue-6.1/interconnect-exynos-fix-registration-race.patch
queue-6.1/interconnect-imx-fix-registration-race.patch
queue-6.1/memory-tegra30-emc-fix-interconnect-registration-race.patch
queue-6.1/interconnect-qcom-msm8974-fix-registration-race.patch
queue-6.1/memory-tegra-fix-interconnect-registration-race.patch
queue-6.1/interconnect-qcom-rpm-fix-probe-child-node-error-handling.patch
queue-6.1/interconnect-qcom-rpm-fix-registration-race.patch
queue-6.1/interconnect-fix-provider-registration-api.patch
queue-6.1/interconnect-fix-icc_provider_del-error-handling.patch
queue-6.1/interconnect-qcom-rpmh-fix-registration-race.patch
queue-6.1/interconnect-fix-mem-leak-when-freeing-nodes.patch
queue-6.1/interconnect-qcom-rpmh-fix-probe-child-node-error-handling.patch
queue-6.1/interconnect-exynos-fix-node-leak-in-probe-pm-qos-error-path.patch
queue-6.1/interconnect-qcom-osm-l3-fix-registration-race.patch
