Unverified Commit c22f2ff8 authored by Johan Hovold's avatar Johan Hovold Committed by Maxime Ripard
Browse files

drm/sun4i: fix missing component unbind on bind errors 



Make sure to unbind all subcomponents when binding the aggregate device
fails.

Fixes: 9026e0d1 ("drm: Add Allwinner A10 Display Engine support")
Cc: stable@vger.kernel.org      # 4.7
Cc: Maxime Ripard <mripard@kernel.org>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20230306103242.4775-1-johan+linaro@kernel.org
parent 5c8cf166

drivers/gpu/drm/sun4i/sun4i_drv.c

+4 −2
Original line number Diff line number Diff line
@@ -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);