Commit e9fbdcb4 authored by Inki Dae's avatar Inki Dae

drm/exynos: fix possible infinite loop issue

This patch fixes possible infinite loop issue by postponing
registration to non kms drivers after component_master_add_with_match
call, which can be incurred in all cases that non kms driver is probed
and then component bind is failed

This patch should be applied on top of below patches,
	http://comments.gmane.org/gmane.comp.video.dri.devel/117740
	http://www.spinics.net/lists/linux-samsung-soc/msg38624.htmlSigned-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 2d151187
...@@ -591,10 +591,21 @@ static int exynos_drm_platform_probe(struct platform_device *pdev) ...@@ -591,10 +591,21 @@ static int exynos_drm_platform_probe(struct platform_device *pdev)
goto err_unregister_mixer_drv; goto err_unregister_mixer_drv;
#endif #endif
match = exynos_drm_match_add(&pdev->dev);
if (IS_ERR(match)) {
ret = PTR_ERR(match);
goto err_unregister_hdmi_drv;
}
ret = component_master_add_with_match(&pdev->dev, &exynos_drm_ops,
match);
if (ret < 0)
goto err_unregister_hdmi_drv;
#ifdef CONFIG_DRM_EXYNOS_G2D #ifdef CONFIG_DRM_EXYNOS_G2D
ret = platform_driver_register(&g2d_driver); ret = platform_driver_register(&g2d_driver);
if (ret < 0) if (ret < 0)
goto err_unregister_hdmi_drv; goto err_del_component_master;
#endif #endif
#ifdef CONFIG_DRM_EXYNOS_FIMC #ifdef CONFIG_DRM_EXYNOS_FIMC
...@@ -625,23 +636,9 @@ static int exynos_drm_platform_probe(struct platform_device *pdev) ...@@ -625,23 +636,9 @@ static int exynos_drm_platform_probe(struct platform_device *pdev)
goto err_unregister_ipp_drv; goto err_unregister_ipp_drv;
#endif #endif
match = exynos_drm_match_add(&pdev->dev);
if (IS_ERR(match)) {
ret = PTR_ERR(match);
goto err_unregister_resources;
}
ret = component_master_add_with_match(&pdev->dev, &exynos_drm_ops,
match);
if (ret < 0)
goto err_unregister_resources;
return ret; return ret;
err_unregister_resources:
#ifdef CONFIG_DRM_EXYNOS_IPP #ifdef CONFIG_DRM_EXYNOS_IPP
exynos_platform_device_ipp_unregister();
err_unregister_ipp_drv: err_unregister_ipp_drv:
platform_driver_unregister(&ipp_driver); platform_driver_unregister(&ipp_driver);
err_unregister_gsc_drv: err_unregister_gsc_drv:
...@@ -664,9 +661,11 @@ static int exynos_drm_platform_probe(struct platform_device *pdev) ...@@ -664,9 +661,11 @@ static int exynos_drm_platform_probe(struct platform_device *pdev)
#ifdef CONFIG_DRM_EXYNOS_G2D #ifdef CONFIG_DRM_EXYNOS_G2D
platform_driver_unregister(&g2d_driver); platform_driver_unregister(&g2d_driver);
err_unregister_hdmi_drv: err_del_component_master:
#endif #endif
component_master_del(&pdev->dev, &exynos_drm_ops);
err_unregister_hdmi_drv:
#ifdef CONFIG_DRM_EXYNOS_HDMI #ifdef CONFIG_DRM_EXYNOS_HDMI
platform_driver_unregister(&hdmi_driver); platform_driver_unregister(&hdmi_driver);
err_unregister_mixer_drv: err_unregister_mixer_drv:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment