iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/meson: Fix error handling when afbcd.ops->init fails

Browse Source 
[ Upstream commit fa747d75f65d1b1cbc3f4691fa67b695e8a399c8 ]

When afbcd.ops->init fails we need to free the struct drm_device. Also
all errors which come after afbcd.ops->init was successful need to exit
the AFBCD, just like meson_drv_unbind() does.

Fixes: d1b5e41e13a7e9 ("drm/meson: Add AFBCD module driver")
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211230235515.1627522-3-martin.blumenstingl@googlemail.com
Stable-dep-of: ba98413bf45e ("drm/meson: fix missing component unbind on bind errors")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Martin Blumenstingl 2021-12-31 00:55:15 +01:00 committed by Greg Kroah-Hartman
parent f7385e0886
commit 794a6cea22
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,38 +320,38 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
if (priv->afbcd.ops) { if (priv->afbcd.ops) {
ret = priv->afbcd.ops->init(priv); ret = priv->afbcd.ops->init(priv);
if (ret) if (ret)
return ret; goto free_drm;
} }
/* Encoder Initialization */ /* Encoder Initialization */
ret = meson_venc_cvbs_create(priv); ret = meson_venc_cvbs_create(priv);
if (ret) if (ret)
goto free_drm; goto exit_afbcd;
if (has_components) { if (has_components) {
ret = component_bind_all(drm->dev, drm); ret = component_bind_all(drm->dev, drm);
if (ret) { if (ret) {
dev_err(drm->dev, "Couldn't bind all components\n"); dev_err(drm->dev, "Couldn't bind all components\n");
goto free_drm; goto exit_afbcd;
} }
} }
ret = meson_plane_create(priv); ret = meson_plane_create(priv);
if (ret) if (ret)
goto free_drm; goto exit_afbcd;
ret = meson_overlay_create(priv); ret = meson_overlay_create(priv);
if (ret) if (ret)
goto free_drm; goto exit_afbcd;
ret = meson_crtc_create(priv); ret = meson_crtc_create(priv);
if (ret) if (ret)
goto free_drm; goto exit_afbcd;
ret = drm_irq_install(drm, priv->vsync_irq); ret = drm_irq_install(drm, priv->vsync_irq);
if (ret) if (ret)
goto free_drm; goto exit_afbcd;
drm_mode_config_reset(drm); drm_mode_config_reset(drm);
@ -369,6 +369,9 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
uninstall_irq: uninstall_irq:
drm_irq_uninstall(drm); drm_irq_uninstall(drm);
exit_afbcd:
if (priv->afbcd.ops)
priv->afbcd.ops->exit(priv);
free_drm: free_drm:
drm_dev_put(drm); drm_dev_put(drm);