Apply analogix_dp_finish_probe() in order to move the panel/bridge parsing from Exynos side to the Analogix side.
Signed-off-by: Damon Ding <[email protected]> Reviewed-by: Dmitry Baryshkov <[email protected]> Tested-by: Marek Szyprowski <[email protected]> --- Changes in v4: - Rename analogix_dp_find_panel_or_bridge() to analogix_dp_finish_probe(). Changes in v7: - Remove exynos_dp_legacy_bridge_init() and inline API devm_drm_of_display_mode_bridge(). - If the panel or the next_bridge is parsed from DT, use ptr validity to check whether to call component_add() directly at the end of probing. --- drivers/gpu/drm/exynos/exynos_dp.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_dp.c b/drivers/gpu/drm/exynos/exynos_dp.c index 478eaa6f3175..6126820aad3b 100644 --- a/drivers/gpu/drm/exynos/exynos_dp.c +++ b/drivers/gpu/drm/exynos/exynos_dp.c @@ -157,9 +157,6 @@ static int exynos_dp_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct device_node *np; struct exynos_dp_device *dp; - struct drm_panel *panel; - struct drm_bridge *bridge; - int ret; dp = devm_kzalloc(&pdev->dev, sizeof(struct exynos_dp_device), GFP_KERNEL); @@ -186,30 +183,30 @@ static int exynos_dp_probe(struct platform_device *pdev) goto out; } - ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0, &panel, &bridge); - if (ret == -ENODEV) { + if (of_get_display_timings(dev->of_node)) { dp->plat_data.next_bridge = devm_drm_of_display_mode_bridge(dp->dev, dp->dev->of_node, DRM_MODE_CONNECTOR_eDP); - ret = IS_ERR(dp->plat_data.next_bridge) ? PTR_ERR(dp->plat_data.next_bridge) : 0; + if (IS_ERR(dp->plat_data.next_bridge)) + return PTR_ERR(dp->plat_data.next_bridge); } - if (ret) - return ret; /* The remote port can be either a panel or a bridge */ - dp->plat_data.panel = panel; - dp->plat_data.next_bridge = bridge; dp->plat_data.dev_type = EXYNOS_DP; dp->plat_data.power_on = exynos_dp_poweron; dp->plat_data.power_off = exynos_dp_poweroff; dp->plat_data.attach = exynos_dp_bridge_attach; + dp->plat_data.ops = &exynos_dp_ops; out: dp->adp = analogix_dp_probe(dev, &dp->plat_data); if (IS_ERR(dp->adp)) return PTR_ERR(dp->adp); - return component_add(&pdev->dev, &exynos_dp_ops); + if (dp->plat_data.panel || dp->plat_data.next_bridge) + return component_add(&pdev->dev, &exynos_dp_ops); + else + return analogix_dp_finish_probe(dp->adp); } static void exynos_dp_remove(struct platform_device *pdev) -- 2.34.1
