xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/meson: fix missing component unbind on bind errors

Browse Source 
[ Upstream commit ba98413bf45edbf33672e2539e321b851b2cfbd1 ]

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

Fixes: a41e82e6c4 ("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>
Acked-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230306103533.4915-1-johan+linaro@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Johan Hovold
2023-03-06 11:35:33 +01:00
committed by Greg Kroah-Hartman
parent 794a6cea22
commit 1635a062fa
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/meson/meson_drv.c
View File

@@ -339,19 +339,19 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
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 = drm_irq_install(drm, priv->vsync_irq);
if (ret)
goto exit_afbcd;
goto unbind_all;
drm_mode_config_reset(drm);
@@ -369,6 +369,9 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
uninstall_irq:
drm_irq_uninstall(drm);
unbind_all:
if (has_components)
component_unbind_all(drm->dev, drm);
exit_afbcd:
if (priv->afbcd.ops)
priv->afbcd.ops->exit(priv);