From nobody Wed Apr 1 23:51:47 2026 Received: from mail-m1973190.qiye.163.com (mail-m1973190.qiye.163.com [220.197.31.90]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BCF8537DE9F; Wed, 1 Apr 2026 09:21:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.90 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775035266; cv=none; b=rVns8NFn4z3wVdmaPD2IEC1Mjj0/EJ2Ch+ilDHsHlu2Z400RNyacG6gefNg8faDwDKDI4lHe67E6X8jVMk6CpdgiHiNMRuvr8HSeZhSdI9zNoRpx7gHSX8YUpSyRv2kRBxAsgYJO5mAxE9aoa+jf9Wx9zNfEefIk4kD4xD4A26E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775035266; c=relaxed/simple; bh=ARuLigKWYMR1zPJ8OWHA/bVvjZYwNIXakbLK5kqEXys=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=P8+WaYzG38c2RKv4Xs14du3KJXT0A3MxJcz45UlB+R/l1saeewp/slk1CqvruhSJSytFq+m1Oq1NByMapa36+BNSISpOQZrTDR19R0/IdhJzsAjWREoYVuEkPmAcs0Dfxri57prWrLlQD3K9SO0WAI0U2oLodsKGEFeKGwbFYmI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rock-chips.com; spf=pass smtp.mailfrom=rock-chips.com; dkim=pass (1024-bit key) header.d=rock-chips.com header.i=@rock-chips.com header.b=OOik9rCs; arc=none smtp.client-ip=220.197.31.90 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rock-chips.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rock-chips.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=rock-chips.com header.i=@rock-chips.com header.b="OOik9rCs" Received: from zyb-HP-ProDesk-680-G2-MT.. (unknown [58.22.7.114]) by smtp.qiye.163.com (Hmail) with ESMTP id 3923a3011; Wed, 1 Apr 2026 17:15:50 +0800 (GMT+08:00) From: Damon Ding To: andrzej.hajda@intel.com, neil.armstrong@linaro.org, rfoss@kernel.org, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, victor.liu@nxp.com, shawnguo@kernel.org, s.hauer@pengutronix.de, inki.dae@samsung.com, sw0312.kim@samsung.com, kyungmin.park@samsung.com, krzk@kernel.org, jingoohan1@gmail.com, p.zabel@pengutronix.de, hjc@rock-chips.com, heiko@sntech.de, andy.yan@rock-chips.com Cc: Laurent.pinchart@ideasonboard.com, jonas@kwiboo.se, jernej.skrabec@gmail.com, kernel@pengutronix.de, festevam@gmail.com, alim.akhtar@samsung.com, dmitry.baryshkov@oss.qualcomm.com, luca.ceresoli@bootlin.com, nicolas.frattaroli@collabora.com, dianders@chromium.org, m.szyprowski@samsung.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-rockchip@lists.infradead.org, Damon Ding Subject: [PATCH v12 11/17] drm/bridge: analogix_dp: Apply drm_bridge_connector helper Date: Wed, 1 Apr 2026 17:14:48 +0800 Message-Id: <20260401091454.25730-12-damon.ding@rock-chips.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260401091454.25730-1-damon.ding@rock-chips.com> References: <20260401091454.25730-1-damon.ding@rock-chips.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-HM-Tid: 0a9d4853e28803a3kunm479af8c3b32e68 X-HM-MType: 1 X-HM-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFDSUNOT01LS0k3V1ktWUFJV1kPCRoVCBIfWUFZQklMS1ZKGB9CQ0NNTE0fGRhWFRQJFh oXVRMBExYaEhckFA4PWVdZGBILWUFZTkNVSUlVTFVKSk9ZV1kWGg8SFR0UWUFZT0tIVUpLSEpKQk 1VSktLVUpCWQY+ DKIM-Signature: a=rsa-sha256; b=OOik9rCsBGxrEEb4tdrrO37kmZlU2Xk53aZ6mPVNyfwC4318o4BnC9En5VKnQiS5GSMoywakLxt0lwsIEqQAiw+e6U4itMrZ7dNgQUItQkliDstdwt7IIXj+rwKd8aa2UXFN7vpsvg7DPCRgt2vTfamMJfr+hb6m8gFjYrDxmRA=; c=relaxed/relaxed; s=default; d=rock-chips.com; v=1; bh=IszKrLEMPHjiIKyQeJyIIww0gXfz9WUf24zZenUbtVc=; h=date:mime-version:subject:message-id:from; Content-Type: text/plain; charset="utf-8" Initialize bridge_connector for both Rockchip and Exynos encoder sides. Then, make DRM_BRIDGE_ATTACH_NO_CONNECTOR mandatory for Analogix bridge side, as the private &drm_connector is no longer created. The previous &drm_connector_funcs and &drm_connector_helper_funcs APIs are replaced by the corresponding &drm_bridge_funcs APIs: analogix_dp_atomic_check() -> analogix_dp_bridge_atomic_check() analogix_dp_detect() -> analogix_dp_bridge_detect() analogix_dp_get_modes() -> analogix_dp_bridge_get_modes() analogix_dp_bridge_edid_read() Additionally, the compatibilities of Analogix DP bridge based on whether the next bridge is a 'panel'. If it is, OP_MODES and OP_DETECT are supported; If not (the next bridge is a 'monitor' or a bridge chip), OP_EDID and OP_DETECT are supported. The devm_drm_bridge_add() is placed in analogix_dp_bind() instead of analogix_dp_probe(), because the type of next bridge (the panel, monitor or bridge chip) can only be determined after the probe process has fully completed. Signed-off-by: Damon Ding Tested-by: Marek Szyprowski Tested-by: Heiko Stuebner (on rk3588) ------ Changes in v2: - For &drm_bridge.ops, remove DRM_BRIDGE_OP_HPD and add DRM_BRIDGE_OP_EDID. - Add analogix_dp_bridge_edid_read(). - Move &analogix_dp_plat_data.skip_connector deletion to the previous patches. Changes in v3: - Rebase with the new devm_drm_bridge_alloc() related commit 48f05c3b4b70 ("drm/bridge: analogix_dp: Use devm_drm_bridge_alloc() API"). - Expand the commit message. - Call drm_bridge_get_modes() in analogix_dp_bridge_get_modes() if the bridge is available. - Remove unnecessary parameter struct drm_connector* for callback &analogix_dp_plat_data.attach. - In order to decouple the connector driver and the bridge driver, move the bridge connector initilization to the Rockchip and Exynos sides. Changes in v4: - Expand analogix_dp_bridge_detect() parameters to &drm_bridge and &drm_connector. - Rename the &analogix_dp_plat_data.bridge to &analogix_dp_plat_data.next_bridge. Changes in v5: - Set the flag fo drm_bridge_attach() to DRM_BRIDGE_ATTACH_NO_CONNECTOR for next bridge attachment of Exynos side. - Distinguish the &drm_bridge->ops of Analogix bridge based on whether the downstream device is a panel, a bridge or neither. - Remove the calls to &analogix_dp_plat_data.get_modes(). Changes in v6: - Select DRM_BRIDGE_CONNECTOR for both Rockchip and Exynos sides. - Remove unnecessary drm_bridge_get_modes() in analogix_dp_bridge_get_modes(). - Simplify analogix_dp_bridge_edid_read(). - If the next is a bridge, set DRM_BRIDGE_OP_DETECT and return connector_status_connected in analogix_dp_bridge_detect(). - Set flag DRM_BRIDGE_ATTACH_NO_CONNECTOR for bridge attachment while binding. Meanwhile, make DRM_BRIDGE_ATTACH_NO_CONNECTOR unsuppported in analogix_dp_bridge_attach(). - Simplify the check of bridge capabilities. Changes in v7: - Remove temporary flag &exynos_dp_device.has_of_bridge. Changes in v9 - Add Tested-by tag. Changes in v10: - Split this commit into serval smaller ones. - Simplify the commit message. Changes in v11: - Move the removal of &analogix_dp_device.connector to this commit. - In exynos_dp_bridge_attach(), set the bridge flag to 'flags | DRM_BRIDGE_ATTACH_NO_CONNECTOR' instead of fixed 'DRM_BRIDGE_ATTACH_NO_CONNECTOR' for extensibility. Changes in v12: - Restore accidentally removed DRM_BRIDGE_CONNECTOR Kconfig in v10. --- .../drm/bridge/analogix/analogix_dp_core.c | 135 +++++++----------- .../drm/bridge/analogix/analogix_dp_core.h | 1 - drivers/gpu/drm/exynos/Kconfig | 1 + drivers/gpu/drm/exynos/exynos_dp.c | 25 ++-- drivers/gpu/drm/rockchip/Kconfig | 1 + .../gpu/drm/rockchip/analogix_dp-rockchip.c | 11 +- 6 files changed, 78 insertions(+), 96 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/g= pu/drm/bridge/analogix/analogix_dp_core.c index 7e42eb18313d..81c6e81dd352 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -856,44 +856,32 @@ static int analogix_dp_disable_psr(struct analogix_dp= _device *dp) return analogix_dp_send_psr_spd(dp, &psr_vsc, true); } =20 -static int analogix_dp_get_modes(struct drm_connector *connector) +static int analogix_dp_bridge_get_modes(struct drm_bridge *bridge, struct = drm_connector *connector) { - struct analogix_dp_device *dp =3D to_dp(connector); - const struct drm_edid *drm_edid; + struct analogix_dp_device *dp =3D to_dp(bridge); int num_modes =3D 0; =20 - if (dp->plat_data->panel) { + if (dp->plat_data->panel) num_modes +=3D drm_panel_get_modes(dp->plat_data->panel, connector); - } else { - drm_edid =3D drm_edid_read_ddc(connector, &dp->aux.ddc); - - drm_edid_connector_update(&dp->connector, drm_edid); - - if (drm_edid) { - num_modes +=3D drm_edid_connector_add_modes(&dp->connector); - drm_edid_free(drm_edid); - } - } =20 return num_modes; } =20 -static struct drm_encoder * -analogix_dp_best_encoder(struct drm_connector *connector) +static const struct drm_edid *analogix_dp_bridge_edid_read(struct drm_brid= ge *bridge, + struct drm_connector *connector) { - struct analogix_dp_device *dp =3D to_dp(connector); + struct analogix_dp_device *dp =3D to_dp(bridge); =20 - return dp->encoder; + return drm_edid_read_ddc(connector, &dp->aux.ddc); } =20 - -static int analogix_dp_atomic_check(struct drm_connector *connector, - struct drm_atomic_state *state) +static int analogix_dp_bridge_atomic_check(struct drm_bridge *bridge, + struct drm_bridge_state *bridge_state, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state) { - struct analogix_dp_device *dp =3D to_dp(connector); - struct drm_display_info *di =3D &connector->display_info; - struct drm_connector_state *conn_state; - struct drm_crtc_state *crtc_state; + struct analogix_dp_device *dp =3D to_dp(bridge); + struct drm_display_info *di =3D &conn_state->connector->display_info; u32 mask =3D DRM_COLOR_FORMAT_YCBCR444 | DRM_COLOR_FORMAT_YCBCR422; =20 if (is_rockchip(dp->plat_data->dev_type)) { @@ -905,38 +893,21 @@ static int analogix_dp_atomic_check(struct drm_connec= tor *connector, } } =20 - conn_state =3D drm_atomic_get_new_connector_state(state, connector); - if (WARN_ON(!conn_state)) - return -ENODEV; - conn_state->self_refresh_aware =3D true; =20 - if (!conn_state->crtc) - return 0; - - crtc_state =3D drm_atomic_get_new_crtc_state(state, conn_state->crtc); - if (!crtc_state) - return 0; - if (crtc_state->self_refresh_active && !dp->psr_supported) return -EINVAL; =20 return 0; } =20 -static const struct drm_connector_helper_funcs analogix_dp_connector_helpe= r_funcs =3D { - .get_modes =3D analogix_dp_get_modes, - .best_encoder =3D analogix_dp_best_encoder, - .atomic_check =3D analogix_dp_atomic_check, -}; - static enum drm_connector_status -analogix_dp_detect(struct drm_connector *connector, bool force) +analogix_dp_bridge_detect(struct drm_bridge *bridge, struct drm_connector = *connector) { - struct analogix_dp_device *dp =3D to_dp(connector); + struct analogix_dp_device *dp =3D to_dp(bridge); enum drm_connector_status status =3D connector_status_disconnected; =20 - if (dp->plat_data->panel) + if (dp->plat_data->panel || dp->plat_data->next_bridge) return connector_status_connected; =20 if (!analogix_dp_detect_hpd(dp)) @@ -945,51 +916,18 @@ analogix_dp_detect(struct drm_connector *connector, b= ool force) return status; } =20 -static const struct drm_connector_funcs analogix_dp_connector_funcs =3D { - .fill_modes =3D drm_helper_probe_single_connector_modes, - .detect =3D analogix_dp_detect, - .destroy =3D drm_connector_cleanup, - .reset =3D drm_atomic_helper_connector_reset, - .atomic_duplicate_state =3D drm_atomic_helper_connector_duplicate_state, - .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, -}; - static int analogix_dp_bridge_attach(struct drm_bridge *bridge, struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) { struct analogix_dp_device *dp =3D to_dp(bridge); - struct drm_connector *connector =3D NULL; int ret =3D 0; =20 - if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) { - DRM_ERROR("Fix bridge driver to make connector optional!"); + if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) { + DRM_ERROR("Unsupported connector creation\n"); return -EINVAL; } =20 - if (!dp->plat_data->next_bridge) { - connector =3D &dp->connector; - connector->polled =3D DRM_CONNECTOR_POLL_HPD; - - ret =3D drm_connector_init(dp->drm_dev, connector, - &analogix_dp_connector_funcs, - DRM_MODE_CONNECTOR_eDP); - if (ret) { - DRM_ERROR("Failed to initialize connector with drm\n"); - return ret; - } - - drm_connector_helper_add(connector, - &analogix_dp_connector_helper_funcs); - drm_connector_attach_encoder(connector, encoder); - } - - /* - * NOTE: the connector registration is implemented in analogix - * platform driver, that to say connector would be exist after - * plat_data->attch return, that's why we record the connector - * point after plat attached. - */ if (dp->plat_data->attach) { ret =3D dp->plat_data->attach(dp->plat_data, bridge); if (ret) { @@ -1309,7 +1247,11 @@ static const struct drm_bridge_funcs analogix_dp_bri= dge_funcs =3D { .atomic_enable =3D analogix_dp_bridge_atomic_enable, .atomic_disable =3D analogix_dp_bridge_atomic_disable, .atomic_post_disable =3D analogix_dp_bridge_atomic_post_disable, + .atomic_check =3D analogix_dp_bridge_atomic_check, .attach =3D analogix_dp_bridge_attach, + .get_modes =3D analogix_dp_bridge_get_modes, + .edid_read =3D analogix_dp_bridge_edid_read, + .detect =3D analogix_dp_bridge_detect, }; =20 static int analogix_dp_dt_parse_pdata(struct analogix_dp_device *dp) @@ -1539,6 +1481,7 @@ EXPORT_SYMBOL_GPL(analogix_dp_resume); =20 int analogix_dp_bind(struct analogix_dp_device *dp, struct drm_device *drm= _dev) { + struct drm_bridge *bridge =3D &dp->bridge; int ret; =20 dp->drm_dev =3D drm_dev; @@ -1552,7 +1495,18 @@ int analogix_dp_bind(struct analogix_dp_device *dp, = struct drm_device *drm_dev) return ret; } =20 - ret =3D drm_bridge_attach(dp->encoder, &dp->bridge, NULL, 0); + if (dp->plat_data->panel) + bridge->ops =3D DRM_BRIDGE_OP_MODES | DRM_BRIDGE_OP_DETECT; + else + bridge->ops =3D DRM_BRIDGE_OP_EDID | DRM_BRIDGE_OP_DETECT; + + bridge->of_node =3D dp->dev->of_node; + bridge->type =3D DRM_MODE_CONNECTOR_eDP; + ret =3D devm_drm_bridge_add(dp->dev, &dp->bridge); + if (ret) + goto err_unregister_aux; + + ret =3D drm_bridge_attach(dp->encoder, bridge, NULL, DRM_BRIDGE_ATTACH_NO= _CONNECTOR); if (ret) { DRM_ERROR("failed to create bridge (%d)\n", ret); goto err_unregister_aux; @@ -1570,7 +1524,6 @@ EXPORT_SYMBOL_GPL(analogix_dp_bind); void analogix_dp_unbind(struct analogix_dp_device *dp) { analogix_dp_bridge_disable(&dp->bridge); - dp->connector.funcs->destroy(&dp->connector); =20 drm_panel_unprepare(dp->plat_data->panel); =20 @@ -1580,7 +1533,8 @@ EXPORT_SYMBOL_GPL(analogix_dp_unbind); =20 int analogix_dp_start_crc(struct drm_connector *connector) { - struct analogix_dp_device *dp =3D to_dp(connector); + struct analogix_dp_device *dp; + struct drm_bridge *bridge; =20 if (!connector->state->crtc) { DRM_ERROR("Connector %s doesn't currently have a CRTC.\n", @@ -1588,13 +1542,26 @@ int analogix_dp_start_crc(struct drm_connector *con= nector) return -EINVAL; } =20 + bridge =3D drm_bridge_chain_get_first_bridge(connector->encoder); + if (bridge->type !=3D DRM_MODE_CONNECTOR_eDP) + return -EINVAL; + + dp =3D to_dp(bridge); + return drm_dp_start_crc(&dp->aux, connector->state->crtc); } EXPORT_SYMBOL_GPL(analogix_dp_start_crc); =20 int analogix_dp_stop_crc(struct drm_connector *connector) { - struct analogix_dp_device *dp =3D to_dp(connector); + struct analogix_dp_device *dp; + struct drm_bridge *bridge; + + bridge =3D drm_bridge_chain_get_first_bridge(connector->encoder); + if (bridge->type !=3D DRM_MODE_CONNECTOR_eDP) + return -EINVAL; + + dp =3D to_dp(bridge); =20 return drm_dp_stop_crc(&dp->aux); } diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h b/drivers/g= pu/drm/bridge/analogix/analogix_dp_core.h index 91b215c6a0cf..17347448c6b0 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h @@ -154,7 +154,6 @@ struct analogix_dp_device { struct drm_encoder *encoder; struct device *dev; struct drm_device *drm_dev; - struct drm_connector connector; struct drm_bridge bridge; struct drm_dp_aux aux; struct clk *clock; diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig index 380d9a8ce259..38bf070866f6 100644 --- a/drivers/gpu/drm/exynos/Kconfig +++ b/drivers/gpu/drm/exynos/Kconfig @@ -70,6 +70,7 @@ config DRM_EXYNOS_DP bool "Exynos specific extensions for Analogix DP driver" depends on DRM_EXYNOS_FIMD || DRM_EXYNOS7_DECON select DRM_ANALOGIX_DP + select DRM_BRIDGE_CONNECTOR select DRM_DISPLAY_DP_HELPER default DRM_EXYNOS select DRM_OF_DISPLAY_MODE_BRIDGE diff --git a/drivers/gpu/drm/exynos/exynos_dp.c b/drivers/gpu/drm/exynos/ex= ynos_dp.c index 71a00ee97782..b2597fafd73d 100644 --- a/drivers/gpu/drm/exynos/exynos_dp.c +++ b/drivers/gpu/drm/exynos/exynos_dp.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -41,8 +42,6 @@ struct exynos_dp_device { =20 struct analogix_dp_device *adp; struct analogix_dp_plat_data plat_data; - - bool has_of_bridge; }; =20 static int exynos_dp_crtc_clock_enable(struct analogix_dp_plat_data *plat_= data, @@ -78,10 +77,8 @@ static int exynos_dp_bridge_attach(struct analogix_dp_pl= at_data *plat_data, =20 /* Pre-empt DP connector creation if there's a bridge */ if (plat_data->next_bridge) { - if (dp->has_of_bridge) - flags =3D DRM_BRIDGE_ATTACH_NO_CONNECTOR; - - ret =3D drm_bridge_attach(&dp->encoder, plat_data->next_bridge, bridge, = flags); + ret =3D drm_bridge_attach(&dp->encoder, plat_data->next_bridge, bridge, + flags | DRM_BRIDGE_ATTACH_NO_CONNECTOR); if (ret) return ret; } @@ -111,6 +108,7 @@ static int exynos_dp_bind(struct device *dev, struct de= vice *master, void *data) struct exynos_dp_device *dp =3D dev_get_drvdata(dev); struct drm_encoder *encoder =3D &dp->encoder; struct drm_device *drm_dev =3D data; + struct drm_connector *connector; int ret; =20 dp->drm_dev =3D drm_dev; @@ -126,10 +124,19 @@ static int exynos_dp_bind(struct device *dev, struct = device *master, void *data) dp->plat_data.encoder =3D encoder; =20 ret =3D analogix_dp_bind(dp->adp, dp->drm_dev); - if (ret) + if (ret) { dp->encoder.funcs->destroy(&dp->encoder); + return ret; + } + + connector =3D drm_bridge_connector_init(dp->drm_dev, dp->plat_data.encode= r); + if (IS_ERR(connector)) { + ret =3D PTR_ERR(connector); + dev_err(dp->dev, "Failed to initialize bridge_connector\n"); + return ret; + } =20 - return ret; + return drm_connector_attach_encoder(connector, dp->plat_data.encoder); } =20 static void exynos_dp_unbind(struct device *dev, struct device *master, @@ -186,8 +193,6 @@ static int exynos_dp_probe(struct platform_device *pdev) dp->dev->of_node, DRM_MODE_CONNECTOR_eDP); ret =3D IS_ERR(dp->plat_data.next_bridge) ? PTR_ERR(dp->plat_data.next_b= ridge) : 0; - if (!ret) - dp->has_of_bridge =3D true; } if (ret) return ret; diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kc= onfig index 1479b8c4ed40..e7f49fe845ea 100644 --- a/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig @@ -46,6 +46,7 @@ config ROCKCHIP_VOP2 config ROCKCHIP_ANALOGIX_DP bool "Rockchip specific extensions for Analogix DP driver" depends on ROCKCHIP_VOP + select DRM_BRIDGE_CONNECTOR select DRM_DISPLAY_HELPER select DRM_DISPLAY_DP_HELPER help diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/= drm/rockchip/analogix_dp-rockchip.c index 70fe5ae69e2e..7fa17ba26c46 100644 --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -369,6 +370,7 @@ static int rockchip_dp_bind(struct device *dev, struct = device *master, { struct rockchip_dp_device *dp =3D dev_get_drvdata(dev); struct drm_device *drm_dev =3D data; + struct drm_connector *connector; int ret; =20 dp->drm_dev =3D drm_dev; @@ -388,7 +390,14 @@ static int rockchip_dp_bind(struct device *dev, struct= device *master, if (ret) goto err_cleanup_encoder; =20 - return 0; + connector =3D drm_bridge_connector_init(dp->drm_dev, dp->plat_data.encode= r); + if (IS_ERR(connector)) { + ret =3D PTR_ERR(connector); + dev_err(dp->dev, "Failed to initialize bridge_connector\n"); + goto err_cleanup_encoder; + } + + return drm_connector_attach_encoder(connector, dp->plat_data.encoder); err_cleanup_encoder: dp->encoder.encoder.funcs->destroy(&dp->encoder.encoder); return ret; --=20 2.34.1