From: Damon Ding Date: Thu, 9 Apr 2026 06:52:47 +0000 (+0800) Subject: drm/exynos: exynos_dp: Remove &exynos_dp_device.ptn_bridge X-Git-Tag: v7.2-rc1~141^2~26^2~128 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=e123c3c5212200c8c443fe0804e7dfc8e9d5986e;p=thirdparty%2Flinux.git drm/exynos: exynos_dp: Remove &exynos_dp_device.ptn_bridge Use &analogix_dp_plat_data.bridge instead of &exynos_dp_device.ptn_bridge directly. Signed-off-by: Damon Ding Reviewed-by: Dmitry Baryshkov Reviewed-by: Luca Ceresoli Tested-by: Marek Szyprowski Tested-by: Heiko Stuebner # rk3588 Link: https://patch.msgid.link/20260409065301.446670-4-damon.ding@rock-chips.com Signed-off-by: Luca Ceresoli --- diff --git a/drivers/gpu/drm/exynos/exynos_dp.c b/drivers/gpu/drm/exynos/exynos_dp.c index 5bcf41e0bd047..f469ac5b3c2a6 100644 --- a/drivers/gpu/drm/exynos/exynos_dp.c +++ b/drivers/gpu/drm/exynos/exynos_dp.c @@ -36,7 +36,6 @@ struct exynos_dp_device { struct drm_encoder encoder; struct drm_connector *connector; - struct drm_bridge *ptn_bridge; struct drm_device *drm_dev; struct device *dev; @@ -106,8 +105,8 @@ static int exynos_dp_bridge_attach(struct analogix_dp_plat_data *plat_data, dp->connector = connector; /* Pre-empt DP connector creation if there's a bridge */ - if (dp->ptn_bridge) { - ret = drm_bridge_attach(&dp->encoder, dp->ptn_bridge, bridge, + if (plat_data->next_bridge) { + ret = drm_bridge_attach(&dp->encoder, plat_data->next_bridge, bridge, 0); if (ret) return ret; @@ -155,7 +154,7 @@ static int exynos_dp_bind(struct device *dev, struct device *master, void *data) dp->drm_dev = drm_dev; - if (!dp->plat_data.panel && !dp->ptn_bridge) { + if (!dp->plat_data.panel && !dp->plat_data.next_bridge) { ret = exynos_dp_dt_parse_panel(dp); if (ret) return ret; @@ -232,6 +231,7 @@ static int exynos_dp_probe(struct platform_device *pdev) /* 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; @@ -239,8 +239,6 @@ static int exynos_dp_probe(struct platform_device *pdev) dp->plat_data.get_modes = exynos_dp_get_modes; dp->plat_data.skip_connector = !!bridge; - dp->ptn_bridge = bridge; - out: dp->adp = analogix_dp_probe(dev, &dp->plat_data); if (IS_ERR(dp->adp))