]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/exynos: exynos_dp: Remove &exynos_dp_device.ptn_bridge
authorDamon Ding <damon.ding@rock-chips.com>
Thu, 9 Apr 2026 06:52:47 +0000 (14:52 +0800)
committerLuca Ceresoli <luca.ceresoli@bootlin.com>
Thu, 9 Apr 2026 12:10:25 +0000 (14:10 +0200)
Use &analogix_dp_plat_data.bridge instead of &exynos_dp_device.ptn_bridge
directly.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Heiko Stuebner <heiko@sntech.de> # rk3588
Link: https://patch.msgid.link/20260409065301.446670-4-damon.ding@rock-chips.com
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
drivers/gpu/drm/exynos/exynos_dp.c

index 5bcf41e0bd047cc26ff0f42fe4c16841738ae619..f469ac5b3c2a6f5b73a8442cc27401b25c519a61 100644 (file)
@@ -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))