From nobody Thu Oct 2 20:29:39 2025 Received: from mail-m32113.qiye.163.com (mail-m32113.qiye.163.com [220.197.32.113]) (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 1B9672F83B0; Tue, 30 Sep 2025 09:14:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.32.113 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759223702; cv=none; b=JwwNhLIhJ+OguQ/ny14786t6iTCSfTwX7Wqy4eYt7cxAtPAiitpuql/Zjtcc5XrWY7OLkbOgHEon8ryr4KvObaN+auj0k9CIGG51JH+oM2aH7zhcA4Z+EKHnalAI4jGT6MUtW/sanYK813FUV9zgrWSktS2UL0OT+Qd1tP+a0sk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759223702; c=relaxed/simple; bh=O+0/4u7fK+MoIXerbUQoE9mhb5tcWdj4KkHKA9kJ6VQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HtvsRTKNfV8TZqS+GxVPDL1DjY5ezbuNEmLRTxzBDkzSzxgOz/o8GztsbVnAB/iKCy2s8XWaVEBfvUO/WfDmQDkUYKesPANBIVnNCb6IVDY784Up03AY2fiiHBPRqMrRrLRjFBUw1d0dcPF9hON45FKFrimigV4KVQqUZci3oQ0= 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=T/Rg09DM; arc=none smtp.client-ip=220.197.32.113 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="T/Rg09DM" Received: from zyb-HP-ProDesk-680-G2-MT.. (unknown [58.22.7.114]) by smtp.qiye.163.com (Hmail) with ESMTP id 249404058; Tue, 30 Sep 2025 17:14:54 +0800 (GMT+08:00) From: Damon Ding To: andrzej.hajda@intel.com, neil.armstrong@linaro.org, rfoss@kernel.org Cc: Laurent.pinchart@ideasonboard.com, jonas@kwiboo.se, jernej.skrabec@gmail.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, inki.dae@samsung.com, sw0312.kim@samsung.com, kyungmin.park@samsung.com, krzk@kernel.org, alim.akhtar@samsung.com, jingoohan1@gmail.com, p.zabel@pengutronix.de, hjc@rock-chips.com, heiko@sntech.de, andy.yan@rock-chips.com, dmitry.baryshkov@oss.qualcomm.com, dianders@chromium.org, m.szyprowski@samsung.com, luca.ceresoli@bootlin.com, jani.nikula@intel.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 v6 12/18] drm/bridge: analogix_dp: Apply drm_bridge_connector helper Date: Tue, 30 Sep 2025 17:09:14 +0800 Message-Id: <20250930090920.131094-13-damon.ding@rock-chips.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250930090920.131094-1-damon.ding@rock-chips.com> References: <20250930090920.131094-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: 0a9999e7433d03a3kunmd96de74a43be12 X-HM-MType: 1 X-HM-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFDSUNOT01LS0k3V1ktWUFJV1kPCRoVCBIfWUFZQh9OGFYfSksaHRhDTkIfSEtWFRQJFh oXVRMBExYaEhckFA4PWVdZGBILWUFZTkNVSUlVTFVKSk9ZV1kWGg8SFR0UWUFZT0tIVUpLSEpKQk 1VSktLVUpCWQY+ DKIM-Signature: a=rsa-sha256; b=T/Rg09DM9j1/09fpjeyyY1h2KqgWHsbFy/QmJpKHGwnMs8CTnne4N1Bgzgzr1O+xzsikk7f0gEZyvx3IezbnZe0mJCPRjus4vOOQ4a6ZZpSDcgPNpxU6cakB1t8FzrxTQOEXwI3aGvEp3zyyM0Vf2spdetvPsz5thAerwIrcPiY=; c=relaxed/relaxed; s=default; d=rock-chips.com; v=1; bh=7zEHQFV7ipEC3ivmAf8Xl0DciN0e5Kso/qPZf4XqJdk=; h=date:mime-version:subject:message-id:from; Content-Type: text/plain; charset="utf-8" Apply drm_bridge_connector helper for Analogix DP driver. The following changes have been made: - Apply drm_bridge_connector helper to get rid of &drm_connector_funcs and &drm_connector_helper_funcs. - Remove unnecessary parameter struct drm_connector* for callback &analogix_dp_plat_data.attach. - Remove &analogix_dp_device.connector. - Convert analogix_dp_atomic_check()/analogix_dp_detect() to &drm_bridge_funcs.atomic_check()/&drm_bridge_funcs.detect(). - Split analogix_dp_get_modes() into &drm_bridge_funcs.get_modes() and &drm_bridge_funcs.edid_read(). - 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(). - Set &drm_bridge.ops according to different cases. Signed-off-by: Damon Ding Tested-by: Marek Szyprowski ------ 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. --- .../drm/bridge/analogix/analogix_dp_core.c | 148 ++++++++---------- .../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 +- include/drm/bridge/analogix_dp.h | 3 +- 7 files changed, 90 insertions(+), 100 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 b0bc96693fdb..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,53 +916,20 @@ 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, connector); + ret =3D dp->plat_data->attach(dp->plat_data, bridge); if (ret) { DRM_ERROR("Failed at platform attach func\n"); return ret; @@ -1095,14 +1033,21 @@ static int analogix_dp_set_bridge(struct analogix_d= p_device *dp) } =20 static void analogix_dp_bridge_mode_set(struct drm_bridge *bridge, + struct drm_atomic_state *state, const struct drm_display_mode *mode) { struct analogix_dp_device *dp =3D to_dp(bridge); - struct drm_display_info *display_info =3D &dp->connector.display_info; struct video_info *video =3D &dp->video_info; struct device_node *dp_node =3D dp->dev->of_node; + struct drm_connector *connector; + struct drm_display_info *display_info; int vic; =20 + connector =3D drm_atomic_get_new_connector_for_encoder(state, bridge->enc= oder); + if (!connector) + return; + display_info =3D &connector->display_info; + /* Input video interlaces & hsync pol & vsync pol */ video->interlaced =3D !!(mode->flags & DRM_MODE_FLAG_INTERLACE); video->v_sync_polarity =3D !!(mode->flags & DRM_MODE_FLAG_NVSYNC); @@ -1186,7 +1131,7 @@ static void analogix_dp_bridge_atomic_enable(struct d= rm_bridge *bridge, new_crtc_state =3D drm_atomic_get_new_crtc_state(old_state, crtc); if (!new_crtc_state) return; - analogix_dp_bridge_mode_set(bridge, &new_crtc_state->adjusted_mode); + analogix_dp_bridge_mode_set(bridge, old_state, &new_crtc_state->adjusted_= mode); =20 old_crtc_state =3D drm_atomic_get_old_crtc_state(old_state, crtc); /* Not a full enable, just disable PSR and continue */ @@ -1302,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) @@ -1532,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; @@ -1545,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; @@ -1563,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 @@ -1573,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", @@ -1581,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 66665d317848..1573620510d0 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_LEGACY_BRIDGE diff --git a/drivers/gpu/drm/exynos/exynos_dp.c b/drivers/gpu/drm/exynos/ex= ynos_dp.c index 8d41de2490d5..e767ac506515 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 @@ -81,19 +82,15 @@ static int exynos_dp_poweroff(struct analogix_dp_plat_d= ata *plat_data) } =20 static int exynos_dp_bridge_attach(struct analogix_dp_plat_data *plat_data, - struct drm_bridge *bridge, - struct drm_connector *connector) + struct drm_bridge *bridge) { struct exynos_dp_device *dp =3D to_dp(plat_data); - enum drm_bridge_attach_flags flags =3D 0; int ret; =20 /* Pre-empt DP connector creation if there's a bridge */ if (plat_data->next_bridge) { - if (drm_bridge_is_legacy(plat_data->next_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, + DRM_BRIDGE_ATTACH_NO_CONNECTOR); if (ret) return ret; } @@ -123,6 +120,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; @@ -138,10 +136,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, diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kc= onfig index b7b025814e72..61e95a3ca6ab 100644 --- a/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig @@ -43,6 +43,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 0a185ebd26af..3b6b2d3ca5d1 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 @@ -368,6 +369,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; @@ -387,7 +389,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; diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix= _dp.h index 3301392eda5f..3428ffff24c5 100644 --- a/include/drm/bridge/analogix_dp.h +++ b/include/drm/bridge/analogix_dp.h @@ -33,8 +33,7 @@ struct analogix_dp_plat_data { =20 int (*power_on)(struct analogix_dp_plat_data *); int (*power_off)(struct analogix_dp_plat_data *); - int (*attach)(struct analogix_dp_plat_data *, struct drm_bridge *, - struct drm_connector *); + int (*attach)(struct analogix_dp_plat_data *, struct drm_bridge *); }; =20 int analogix_dp_resume(struct analogix_dp_device *dp); --=20 2.34.1