From nobody Sat Jul 25 05:59:35 2026 Received: from smtpbguseast3.qq.com (smtpbguseast3.qq.com [54.243.244.52]) (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 AE74D38F232 for ; Fri, 17 Jul 2026 07:23:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=54.243.244.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784273028; cv=none; b=LewEI9PmnqoT5XLDKm00T1bomjaTYTsP0zowPKiW4Z1vq7ToWeIfXa8inlJ0+OQElgTJ7ueANG1FjWXFE/4+YMPxkV91YS8/EuxxsV2msMQCQ+yak5vQlhYpDafdB0CQ0CMEx/l4Sxy90erAjFl9dgPP2cQclufWNrMHp/uR1/c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784273028; c=relaxed/simple; bh=V6FBW9QxLhbz2EPo4D9DprtPIfWP/SXdUJYcivq3sZY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=LtuUFrU/xioBh6N+Ns28f6SpF98RMJqSpvODZ4srzn85a7qmC7jqXG7OGfmyreo3SJr8d8xxHt1rfS2hJwWCIgjpWZhXeKISyH8v3oJzBDDjg1pPoz9Y8oixy65fnjH/u3uv67Q2a4CtF24mtLAcnuJAnpwF5+Nc2Khc26lfIoM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=airkyi.com; spf=pass smtp.mailfrom=airkyi.com; dkim=pass (1024-bit key) header.d=airkyi.com header.i=@airkyi.com header.b=DlqopraU; arc=none smtp.client-ip=54.243.244.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=airkyi.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=airkyi.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=airkyi.com header.i=@airkyi.com header.b="DlqopraU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=airkyi.com; s=altu2504; t=1784273017; bh=wyo7ub+4BApocKz9R0jl9tIayPTluBedW1dt0z+RsIE=; h=From:To:Subject:Date:Message-Id; b=DlqopraUkFrslsy1LOTBas2mktEhaeZbD6RmGUYXv1ziJ6kUrJwFc9qycfSb00Cee /YsaAxl3c6pan71zbzCB4Jyz2gJ09V8RRkJXoGrieIhDD00WOpzUyAYaOzM+S7HO24 uvMTsmdRq+URJ0KsND/43adg8LUCl2lH5zjkTmsE= X-QQ-mid: esmtpsz21t1784273015t55286922 X-QQ-Originating-IP: FCFwPLEn8pNCTJOV0JUPVpFgU5y4+bvUtPQEL4lUcV8= Received: from DESKTOP-8BT1A2O.localdomain ( [61.154.14.86]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 17 Jul 2026 15:23:31 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 5852056859405087285 From: Chaoyi Chen To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Luca Ceresoli , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sandy Huang , =?UTF-8?q?Heiko=20St=C3=BCbner?= , Andy Yan , Vinod Koul , Chaoyi Chen , Sebastian Reichel , Nicolas Frattaroli Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-phy@lists.infradead.org Subject: [PATCH v3 1/5] drm/bridge: Implement generic USB Type-C DP HPD bridge Date: Fri, 17 Jul 2026 15:23:19 +0800 Message-Id: <20260717072323.96-2-kernel@airkyi.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20260717072323.96-1-kernel@airkyi.com> References: <20260717072323.96-1-kernel@airkyi.com> X-QQ-SENDSIZE: 520 Feedback-ID: esmtpsz:airkyi.com:qybglogicsvrgz:qybglogicsvrgz6b-0 X-QQ-XMAILINFO: N2m11JoOujTSDqG2v5a8bq3PNqk/AOap+juyIVjRE/yqdE+vqaKN2mSW 8EwW9UGGgLSywGokpsau3CEDrR+BvSy09LW2TIfbSqg3q/u2mPmiWEt+WZU65+NCNw1f3Yg BQwXxW8VpJnrBYx6nIjuDIK+rd5AH4ScDK4JVjOSgZmsJ/ZweW/G6glXHzJd1LqUCPrYV17 NFfbn/eNI911Kf0YdWMMUKfFMIzUI8eeBOmKKayBvLKWF3yMWrgPxWSUtkhNbezKEnvvZ5f JJx6SxPhPxOk63Ovy0VAjaVqTVQsUh8ujR60CTJVY1FJa58H1whFSwKwPo+XFbVRzwdL3zg GRcpmZqJ4YOvbZwEq6zwnQuCTiDE62NmYaRWnEyTmrjPYKDp13I6zYbSzoqv9FSU+djULWo D1h8poTwyjwLY+mR9qFF5gVD8yAeIXRSE0hipvmJPbVragX9SKSaWXGLMqPOSlmltVX2Yzx 9tx7JBBC/PhVKzNc7c2zsG6AuMaQqV67xLhWUlezeC9B+KEFY5Jhc25NHbNNcUTnwzCou/1 dXEuhG102HZMFDsfEyokUiz4I8AtrKNYvVoK0kJDyJV8zM3Sm3W+veV5s4l2WQShp87vBkq kv3u3YUgPXleT7mk/7bwRNB05TXnmAUjYMdmmvcXJtrgbu1A1pbjoORGNQjEYhuT7gEHIFO uwIYP3aJn4HUyqQSY/J9xML+m0Lf/hNOJ9mLj27rIDDbKE7Qltn1cvjxJ8NCH0ucbGXX2Dz M2X0togBOg7+9mt1CM5FzSZCSXua1cQARnjNHt16YPFrS1kjcEcomIAN1fq8dUM7YR3zTQ3 71r7Ji69ayAENFHEIiJx5S+ykrFVWj/dJDMMWmQ6/d9t+4k94c7U687HL0uka+TaSU4VXZM OWlZVRoyEKV2SnTiml4r4mmrVxNZYO3xez0joyw7U1PuJikXQBFdULGzergZF3stgK0QI6Q j4Wy2H8jh9cd+9U6nCH7EPdV7zbFvzxg97Js2Kn2puaq7mLm/pg39E1oWuDOjvYIGVmw5d7 PZtqx9eAi/GgRpz9qLNqlHAXbBmRhftDVd5JWY5g== X-QQ-XMRINFO: OWPUhxQsoeAVwkVaQIEGSKwwgKCxK/fD5g== X-QQ-RECHKSPAM: 0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Chaoyi Chen The HPD function of Type-C DP is implemented through drm_connector_oob_hotplug_event(). For embedded DP, it is required that the DRM connector fwnode corresponds to the Type-C port fwnode. To describe the relationship between the DP controller and the Type-C port device, we usually using drm_bridge to build a bridge chain. Now several USB-C controller drivers have already implemented the DP HPD bridge function provided by aux-hpd-bridge.c, it will build a DP HPD bridge on USB-C connector port device. But this requires the USB-C controller driver to manually register the HPD bridge. If the driver does not implement this feature, the bridge will not be create. So this patch implements a generic DP HPD bridge based on aux-hpd-bridge.c. It will monitor Type-C bus events, and when a Type-C port device containing the DP svid is registered, it will create an HPD bridge for it without the need for the USB-C controller driver to implement it. Signed-off-by: Chaoyi Chen Reviewed-by: Heikki Krogerus Reviewed-by: Nicolas Frattaroli Reviewed-by: Sebastian Reichel Tested-by: Sebastian Reichel # ArmSom Sig= e5 --- (no changes since v3) Changes in v2: - Add copyright text. - Remove useless goto. --- drivers/gpu/drm/bridge/Kconfig | 10 ++++ drivers/gpu/drm/bridge/Makefile | 1 + .../gpu/drm/bridge/aux-hpd-typec-dp-bridge.c | 54 +++++++++++++++++++ 3 files changed, 65 insertions(+) create mode 100644 drivers/gpu/drm/bridge/aux-hpd-typec-dp-bridge.c diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index 4a57d49b4c6d..9739b2a19758 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -30,6 +30,16 @@ config DRM_AUX_HPD_BRIDGE Simple bridge that terminates the bridge chain and provides HPD support. =20 +if DRM_AUX_HPD_BRIDGE +config DRM_AUX_HPD_TYPEC_BRIDGE + tristate + depends on TYPEC || !TYPEC + default TYPEC + help + Simple bridge that terminates the bridge chain and provides HPD + support. It build bridge on each USB-C connector device node. +endif + menu "Display Interface Bridges" depends on DRM && DRM_BRIDGE =20 diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makef= ile index 15cc821d85b7..d88a9e1ccc9a 100644 --- a/drivers/gpu/drm/bridge/Makefile +++ b/drivers/gpu/drm/bridge/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_DRM_AUX_BRIDGE) +=3D aux-bridge.o obj-$(CONFIG_DRM_AUX_HPD_BRIDGE) +=3D aux-hpd-bridge.o +obj-$(CONFIG_DRM_AUX_HPD_TYPEC_BRIDGE) +=3D aux-hpd-typec-dp-bridge.o obj-$(CONFIG_DRM_CHIPONE_ICN6211) +=3D chipone-icn6211.o obj-$(CONFIG_DRM_CHRONTEL_CH7033) +=3D chrontel-ch7033.o obj-$(CONFIG_DRM_CROS_EC_ANX7688) +=3D cros-ec-anx7688.o diff --git a/drivers/gpu/drm/bridge/aux-hpd-typec-dp-bridge.c b/drivers/gpu= /drm/bridge/aux-hpd-typec-dp-bridge.c new file mode 100644 index 000000000000..c09579ff7ab9 --- /dev/null +++ b/drivers/gpu/drm/bridge/aux-hpd-typec-dp-bridge.c @@ -0,0 +1,54 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2026 Rockchip Electronics Co., Ltd. + * + * Author: Chaoyi Chen + */ +#include +#include +#include + +#include + +static int drm_typec_bus_event(struct notifier_block *nb, + unsigned long action, void *data) +{ + struct device *dev =3D (struct device *)data; + struct typec_altmode *alt =3D to_typec_altmode(dev); + + if (action !=3D BUS_NOTIFY_ADD_DEVICE) + return NOTIFY_OK; + + /* + * alt->dev.parent->parent : USB-C controller device + * alt->dev.parent : USB-C connector device + */ + if (is_typec_port_altmode(&alt->dev) && alt->svid =3D=3D USB_TYPEC_DP_SID) + drm_dp_hpd_bridge_register(alt->dev.parent->parent, + to_of_node(alt->dev.parent->fwnode)); + + return NOTIFY_OK; +} + +static struct notifier_block drm_typec_event_nb =3D { + .notifier_call =3D drm_typec_bus_event, +}; + +static void drm_aux_hpd_typec_dp_bridge_module_exit(void) +{ + bus_unregister_notifier(&typec_bus, &drm_typec_event_nb); +} + +static int __init drm_aux_hpd_typec_dp_bridge_module_init(void) +{ + bus_register_notifier(&typec_bus, &drm_typec_event_nb); + + return 0; +} + +module_init(drm_aux_hpd_typec_dp_bridge_module_init); +module_exit(drm_aux_hpd_typec_dp_bridge_module_exit); + +MODULE_AUTHOR("Chaoyi Chen "); +MODULE_DESCRIPTION("DRM TYPEC DP HPD BRIDGE"); +MODULE_LICENSE("GPL"); --=20 2.53.0 From nobody Sat Jul 25 05:59:35 2026 Received: from smtpbguseast2.qq.com (smtpbguseast2.qq.com [54.204.34.130]) (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 1B4353DDAF3 for ; Fri, 17 Jul 2026 07:23:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=54.204.34.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784273036; cv=none; b=jfY2qZiIFiw1dDQHbn+WF3GZ4B/qXkvDGn0BGk5JxNnUOhIxsHnNtUNF6Ww6uGn8UCWV+ekiOZWDp0GLzthkNMoxWdLbU175+y2irW7Bfep87ZgtcLKuEL9zXe1FHlIljm9DdF9BTvLN06zARWIfimpfUglZXAMw8bMaFKJ7Gn0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784273036; c=relaxed/simple; bh=qKfQNlkfq/KM9oQGuS1GCb5y4ugvg1maTB+9PMhEEiY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=P2O9hF56lXasxBcdrZFRzM/S50XkMB2GULYrr+mXDPF+RmZNkoacxjNJYym1vMfEWrdXijtmfEoK9SiYQ01i2a6fJ9tLy5XbJw5ro0RamV4niufGHgeDhAuwKWVAiv9UMqm1vo/7hGxreYqpkA6KkafGIqLPtYjGioq7bwx+z6I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=airkyi.com; spf=pass smtp.mailfrom=airkyi.com; dkim=pass (1024-bit key) header.d=airkyi.com header.i=@airkyi.com header.b=m0v/PbXF; arc=none smtp.client-ip=54.204.34.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=airkyi.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=airkyi.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=airkyi.com header.i=@airkyi.com header.b="m0v/PbXF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=airkyi.com; s=altu2504; t=1784273021; bh=0RTzPafltaazrRSyLxjVEGPsM2NQMO3dAbcjHX9A5Js=; h=From:To:Subject:Date:Message-Id; b=m0v/PbXFjoVfg/etc86IfXSNraL9jpHMY9RVcks7wSEJ6lMm59724GgFeT8VUohGK CLoFgEvoZr5hOaMgwAhskuWhBO19vdlGz86py7MduylhqXxww3/OmqYxc964lNwSJq vXTcu/7iy2rxRQ4PQEo+ZfdZYziS5Thg7BFjU6Cg= X-QQ-mid: esmtpsz21t1784273020t7817df7e X-QQ-Originating-IP: leVM35CjBJyorupngfOKPVO9zy8OXxTLO9HgUYQgbrQ= Received: from DESKTOP-8BT1A2O.localdomain ( [61.154.14.86]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 17 Jul 2026 15:23:36 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 7948544626275222202 From: Chaoyi Chen To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Luca Ceresoli , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sandy Huang , =?UTF-8?q?Heiko=20St=C3=BCbner?= , Andy Yan , Vinod Koul , Chaoyi Chen , Sebastian Reichel , Nicolas Frattaroli Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-phy@lists.infradead.org Subject: [PATCH v3 2/5] drm/bridge: aux: Add drm_aux_bridge_register_from_node() Date: Fri, 17 Jul 2026 15:23:20 +0800 Message-Id: <20260717072323.96-3-kernel@airkyi.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20260717072323.96-1-kernel@airkyi.com> References: <20260717072323.96-1-kernel@airkyi.com> X-QQ-SENDSIZE: 520 Feedback-ID: esmtpsz:airkyi.com:qybglogicsvrgz:qybglogicsvrgz6b-0 X-QQ-XMAILINFO: NPQ6h5IKr4GpDPYSgRuo+O6HS1zx7mm7cSbQUgenL4oXgeq9mf2jA0k3 d+9lnMzk2a/L/mwZxCIQ4oGNJuog5koOSc/D+dpm9GHTziYhK3jvQC3LOneLFAVGWoNRaPV zet/8GTaQOVABtFLEgrpSvc+0fhQeL/T0Y76Zfch3ETn4nCQmkGklgzm4IRPOx1fTgCqSf+ zLUsTi2CfRRnkTcDbnHUZS4ncHT/eDNN31SeC6Bv7c3vb+0ohzIa3YQHPdgGGNtympDoKHl ECoKr0mQOXvoVmftnt8aWQeQw5QYVLUeRCB/1t5fQsVs8qNOaiGn3rOhmFxE8WUuMq4YjvQ 4PBwem56TMPE22QG8iX7gFym71zuuNrSi44c6s1Yp+imrJJDa4mUDBzaJw5RbAlEq3UfrTR FMwGWOg+ME4xOZrxh0vQPeRVRi6ssX9v/YDt17jGJZgJd+u3sha71guZC4ERHCyE/ZsZCOM LK61GOSRGZ+bbhf1Gn6yJcCdV52r7krRCoI33a/DUYEeXODYZmXUCAXCKD22/HP1/o9B/MS VjaIVT197RHX8NJ1DaR+JK4hh37VSon7O8JQRYP/dXmk8LOvZbtlyONOUxtUqX7wZBocmoq TBFHCtChX6r6iqBhlb/4joTzK8ZqlP7PN3otshlo+pxdYmyuYtdMZIB5UtWVYFaYTHhSJvP POtqQKkfVRY0QVdVgICvq9zWMPk+QqwAljIhsf2OeKTCpZ5a8bn/AQokjKCUVY/DyahV1do mch1OfrRzmSBqsGn8zy19ZHyNetFx0RCtoNCSHcSsw+OljBrQ4DkfXd73MH2H61QMajsAt4 vNcamxfpUkzBUGAK4idcgqI+x7fMLFTzCmzrXYREAXrZC6jSuWtoa4yT6BBvGUOcjvl4U5k hgd6DuFIl8vbSqFMzMZW5U7Qick/wb/r7wk3Rn1ARRz8Pf9v6ixzLb/QyBPAsGB0kf+Ph/B ppOBCKyDw52P7wkzl4APkFmGOSjclDN+MQs2qKquzXTGToi6wa+veKMbjPmD7UshLRgiUBK Jhic0qYaGSgSEqVvPK X-QQ-XMRINFO: Nq+8W0+stu50tPAe92KXseR0ZZmBTk3gLg== X-QQ-RECHKSPAM: 0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Chaoyi Chen The drm_aux_bridge_register() uses the device->of_node as the bridge->of_node. This patch adds drm_aux_bridge_register_from_node() to allow specifying the of_node corresponding to the bridge. Signed-off-by: Chaoyi Chen Reviewed-by: Neil Armstrong Reviewed-by: Nicolas Frattaroli Reviewed-by: Sebastian Reichel --- (no changes since v3) Changes in v2: - Fix incorrect function names in the documentation comments. --- drivers/gpu/drm/bridge/aux-bridge.c | 26 +++++++++++++++++++++++--- include/drm/bridge/aux-bridge.h | 6 ++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/bridge/aux-bridge.c b/drivers/gpu/drm/bridge/a= ux-bridge.c index 1ed21a8713bf..06a1466f49bd 100644 --- a/drivers/gpu/drm/bridge/aux-bridge.c +++ b/drivers/gpu/drm/bridge/aux-bridge.c @@ -33,8 +33,9 @@ static void drm_aux_bridge_unregister_adev(void *_adev) } =20 /** - * drm_aux_bridge_register - Create a simple bridge device to link the cha= in + * drm_aux_bridge_register_from_node - Create a simple bridge device to li= nk the chain * @parent: device instance providing this bridge + * @np: device node pointer corresponding to this bridge instance * * Creates a simple DRM bridge that doesn't implement any drm_bridge * operations. Such bridges merely fill a place in the bridge chain linking @@ -42,7 +43,7 @@ static void drm_aux_bridge_unregister_adev(void *_adev) * * Return: zero on success, negative error code on failure */ -int drm_aux_bridge_register(struct device *parent) +int drm_aux_bridge_register_from_node(struct device *parent, struct device= _node *np) { struct auxiliary_device *adev; int ret; @@ -62,7 +63,10 @@ int drm_aux_bridge_register(struct device *parent) adev->dev.parent =3D parent; adev->dev.release =3D drm_aux_bridge_release; =20 - device_set_of_node_from_dev(&adev->dev, parent); + if (np) + device_set_node(&adev->dev, of_fwnode_handle(np)); + else + device_set_of_node_from_dev(&adev->dev, parent); =20 ret =3D auxiliary_device_init(adev); if (ret) { @@ -80,6 +84,22 @@ int drm_aux_bridge_register(struct device *parent) =20 return devm_add_action_or_reset(parent, drm_aux_bridge_unregister_adev, a= dev); } +EXPORT_SYMBOL_GPL(drm_aux_bridge_register_from_node); + +/** + * drm_aux_bridge_register - Create a simple bridge device to link the cha= in + * @parent: device instance providing this bridge + * + * Creates a simple DRM bridge that doesn't implement any drm_bridge + * operations. Such bridges merely fill a place in the bridge chain linking + * surrounding DRM bridges. + * + * Return: zero on success, negative error code on failure + */ +int drm_aux_bridge_register(struct device *parent) +{ + return drm_aux_bridge_register_from_node(parent, NULL); +} EXPORT_SYMBOL_GPL(drm_aux_bridge_register); =20 struct drm_aux_bridge_data { diff --git a/include/drm/bridge/aux-bridge.h b/include/drm/bridge/aux-bridg= e.h index c2f5a855512f..7dd1f17a1354 100644 --- a/include/drm/bridge/aux-bridge.h +++ b/include/drm/bridge/aux-bridge.h @@ -13,11 +13,17 @@ struct auxiliary_device; =20 #if IS_ENABLED(CONFIG_DRM_AUX_BRIDGE) int drm_aux_bridge_register(struct device *parent); +int drm_aux_bridge_register_from_node(struct device *parent, struct device= _node *np); #else static inline int drm_aux_bridge_register(struct device *parent) { return 0; } + +static inline int drm_aux_bridge_register_from_node(struct device *parent,= struct device_node *np) +{ + return 0; +} #endif =20 #if IS_ENABLED(CONFIG_DRM_AUX_HPD_BRIDGE) --=20 2.53.0 From nobody Sat Jul 25 05:59:35 2026 Received: from smtpbguseast3.qq.com (smtpbguseast3.qq.com [54.243.244.52]) (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 1B0603C4B68 for ; Fri, 17 Jul 2026 07:23:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=54.243.244.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784273036; cv=none; b=I/scQoNPfZXipMndKFRnaFi8KaX+TivWO/wl2CZWlQblLHSkyPs7dsQGa7+1uJ2FoiET6rKQoGtaoQrt5R8N8byayvyiMug1UqPvAeosgPhup3UcI63ChbYgEBQHZismksGrQxYJ3Lt4Sgl/1clWEorrqOI0BgKNJFxEBA++bpI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784273036; c=relaxed/simple; bh=pnKrO2JPi7TqlumR6Mrvl6jpLl4SAIGpj9tmPD6rQ7A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=os+R32F8ZzXtFcPfEAEu1aozHKp//blz1/+e/rbUenI35bLFsdv+Dh/f2R1WcWCYFk62woZYW83gvjdCFx7LOG7xxxmGwlC7qDTgD0paVjkT/S8Hz+Oo3LmsLR1TmSJf+CyPFNyO+teHGV3YoVO2FbNN948XqG+Gc0x/ibj9dIo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=airkyi.com; spf=pass smtp.mailfrom=airkyi.com; dkim=pass (1024-bit key) header.d=airkyi.com header.i=@airkyi.com header.b=FQ2bE8iR; arc=none smtp.client-ip=54.243.244.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=airkyi.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=airkyi.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=airkyi.com header.i=@airkyi.com header.b="FQ2bE8iR" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=airkyi.com; s=altu2504; t=1784273026; bh=E2l8SC5Yz3l3RQ8kfLiWXU6wvt0RqrCjSGXwLiFhpCg=; h=From:To:Subject:Date:Message-Id; b=FQ2bE8iRmphu5Svq3UCaWgJVaoG+Xx/iNYffhRe5gwHIXbQWQm4eZwKIgboQO7YHP 8NUX5HBTP5jFQ4SGHlZodDgIBgxlhM8HO6b/lirmJZqPdOr+emUNx3FHflwk9Ajt+6 lg5sLukoI5ycfWnDFLZS0LVbl2iJPMLWtcpMRylo= X-QQ-mid: esmtpsz21t1784273025t3c480ea3 X-QQ-Originating-IP: NunsL3AmaX5/YohLrjzcmQgzMxqBfZtsaBbae5D+VuY= Received: from DESKTOP-8BT1A2O.localdomain ( [61.154.14.86]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 17 Jul 2026 15:23:41 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 13698718535468355926 From: Chaoyi Chen To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Luca Ceresoli , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sandy Huang , =?UTF-8?q?Heiko=20St=C3=BCbner?= , Andy Yan , Vinod Koul , Chaoyi Chen , Sebastian Reichel , Nicolas Frattaroli Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-phy@lists.infradead.org Subject: [PATCH v3 3/5] phy: rockchip: phy-rockchip-typec: Add DRM AUX bridge Date: Fri, 17 Jul 2026 15:23:21 +0800 Message-Id: <20260717072323.96-4-kernel@airkyi.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20260717072323.96-1-kernel@airkyi.com> References: <20260717072323.96-1-kernel@airkyi.com> X-QQ-SENDSIZE: 520 Feedback-ID: esmtpsz:airkyi.com:qybglogicsvrgz:qybglogicsvrgz6b-0 X-QQ-XMAILINFO: NV2lcDTbOWYUoxuYtXyCQ3vsmDoz9eNOH8ezo2fwo/3lxmAa5QP+2dK9 7VvAh8w77475SxHveUMWtUPyfXNgV40fKH/XlgoZFN7PWssOAY4vCswL+MYis5d43xcL3WS 7ZyIMFzNO5kNyJtOtBdXY8pI4T573U22Vgls1K/G8Jnp1PRY6BfOV0TyHCS6r2YYPPqahjM BlD6VpspC3yz7ns6yaKs4nUVCnJyPzfmQFvncVIGMCNUy2+d9HsHWnddTBB2MVrm7h/DyyC IDRvsuFmGAhR9BVKXQdasXvl8OO8Nd+9NdCEr/Kdh3aXhe9yNR39o5Tn3dXIJ1zsW4+0DZC A0zf2epjdWlWF4fbIn1uTglZ0Tgqm7jaHB6m4v1WYz6EAumksldRNs4vmJepYcDl9lnVLnc ADv0qYwUY+6LB/bVSNo74fs1CfDMhRl0Oh1Qze35GXfISzHOsxBex6LdF1MsnQHLjJ+HUs1 WEgdgxRJbjQQzKXxYRidsdqhUa/6mWZBnpMaN9lX4d71Ct4nd7RmU+2QnhCcp5KkX20vfD4 98hKzjZ8b1M8EAA++YP9FUaG0tdtqcZ/PGm+jWZjLKQXAcR2vvj+rx5SzrAOgZB0GRYQFVf KV+ySvTJTrAy9PsH04LLh6MAWuqfdUUoPWyW87tk4lSZajawyR4NPCy/p484l6cLH4J2OwS Oa38l3mx6vKeVIMHg6FR89pRtZ+411C6ArFFPw1A6Wo46WocFmDBL/NhVJb2F8rv5JY3Ms8 oNbRKJu7gVOYHxi2CoIZ2/3AqG+4dITvx/ZHmYV9z6hfYJZp3GUZ7u/UMwwrD+ya6jfDeho l0MhbZKQjGEkGOIyaNH5GlY+YdzyDsXHTrYdEm1bBbA2RMGxY8pnQ0g8cNjKupaoRGdq59h gVAcxD1Q8/UUx5EMx1q4+VHTD4I0p8aNo8oVqMS3ZkBYopviaOOeLPV377sv2GElRbhLH/T jQhNsPW2QVkYPTje8bPkAszfKUC2q4MTK7uYX9qJFowsInvPVjxseVJAtzF6Jvik7JIxRI4 0uRMqdrgvYxO0RCbA4 X-QQ-XMRINFO: OWPUhxQsoeAVwkVaQIEGSKwwgKCxK/fD5g== X-QQ-RECHKSPAM: 0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Chaoyi Chen Using the DRM_AUX_BRIDGE helper to create the transparent DRM bridge device. Signed-off-by: Chaoyi Chen Reviewed-by: Neil Armstrong Reviewed-by: Sebastian Reichel --- (no changes since v1) --- drivers/phy/rockchip/Kconfig | 2 ++ drivers/phy/rockchip/phy-rockchip-typec.c | 13 +++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/phy/rockchip/Kconfig b/drivers/phy/rockchip/Kconfig index 14698571b607..9173d3b4fef4 100644 --- a/drivers/phy/rockchip/Kconfig +++ b/drivers/phy/rockchip/Kconfig @@ -119,6 +119,8 @@ config PHY_ROCKCHIP_SNPS_PCIE3 config PHY_ROCKCHIP_TYPEC tristate "Rockchip TYPEC PHY Driver" depends on OF && (ARCH_ROCKCHIP || COMPILE_TEST) + depends on DRM || DRM=3Dn + select DRM_AUX_BRIDGE if DRM_BRIDGE select EXTCON select GENERIC_PHY select RESET_CONTROLLER diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockch= ip/phy-rockchip-typec.c index d9701b6106d5..48070b50416e 100644 --- a/drivers/phy/rockchip/phy-rockchip-typec.c +++ b/drivers/phy/rockchip/phy-rockchip-typec.c @@ -54,6 +54,7 @@ =20 #include #include +#include =20 #define CMN_SSM_BANDGAP (0x21 << 2) #define CMN_SSM_BIAS (0x22 << 2) @@ -1162,16 +1163,24 @@ static int rockchip_typec_phy_probe(struct platform= _device *pdev) =20 for_each_available_child_of_node(np, child_np) { struct phy *phy; + ret =3D 0; =20 - if (of_node_name_eq(child_np, "dp-port")) + if (of_node_name_eq(child_np, "dp-port")) { phy =3D devm_phy_create(dev, child_np, &rockchip_dp_phy_ops); - else if (of_node_name_eq(child_np, "usb3-port")) + ret =3D drm_aux_bridge_register_from_node(dev, child_np); + } else if (of_node_name_eq(child_np, "usb3-port")) phy =3D devm_phy_create(dev, child_np, &rockchip_usb3_phy_ops); else continue; =20 + if (ret) { + pm_runtime_disable(dev); + of_node_put(child_np); + return ret; + } + if (IS_ERR(phy)) { dev_err(dev, "failed to create phy: %pOFn\n", child_np); --=20 2.53.0 From nobody Sat Jul 25 05:59:35 2026 Received: from smtpbgsg2.qq.com (smtpbgsg2.qq.com [54.254.200.128]) (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 94D54384242 for ; Fri, 17 Jul 2026 07:24:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=54.254.200.128 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784273050; cv=none; b=AM1mL8t9AxFIQDmLDayNA4otuTIN5qRHQi1uZKuf3ccuG67YprB9g9x+wXprgC5sOAT/+EUDAQcrBasSKbi0LNtM+OeZdCLnvwDLoSla7EEFYOZI2hHfACZuMxSQr8NaZy2jYbgXIxi3n+rN1kKen9Tyh1Hm5ku/LccMh/bujSE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784273050; c=relaxed/simple; bh=Do2vEEbKffBKIoRwA8XTtrCuUyMId8s9a5j5NUcntlY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=Zf74TgtWzv8v2SkGmAB+nAyMyTEaCqUzqRZMrHAUP4hxa7/ICQW8URZwYIhAYj1NlieZfqE/P9O4yCxLTCLgvkC3aeN1T4MPMkutZ8A0y88Efu93Vm4wPM73quRH0xNrDe/iUuiRh0ymY51FNR0TTtouQnFD2/Vvt55YuyuvmVU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=airkyi.com; spf=pass smtp.mailfrom=airkyi.com; dkim=pass (1024-bit key) header.d=airkyi.com header.i=@airkyi.com header.b=fYXEyAss; arc=none smtp.client-ip=54.254.200.128 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=airkyi.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=airkyi.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=airkyi.com header.i=@airkyi.com header.b="fYXEyAss" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=airkyi.com; s=altu2504; t=1784273038; bh=hfSDcA/VFf5O36XZ1jIbDeiIvlPOe5N0iYnQa5D5SVg=; h=From:To:Subject:Date:Message-Id; b=fYXEyAssbfHboxP5QdcQ6RM2gOmJnmbbZPGsTBD8SPtT5gd9wFAY0UGeMT42MDXjg ukdaXkyvlWNUDsUmO5b1iLRbYYMRG/QeFAQFz4251JelGmBGAojVXu38G0dj288PxV s4kIBlvRsQ0tUQ6lT1r3APLRPP5/q4mEgB0ZxaLk= X-QQ-mid: esmtpsz21t1784273037t8aa6d3dc X-QQ-Originating-IP: 0D5wUK+GE2YIGxT4HuuhDJ2D57emU1+Gs34WtC5gClQ= Received: from DESKTOP-8BT1A2O.localdomain ( [61.154.14.86]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 17 Jul 2026 15:23:46 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 8582860570799389207 From: Chaoyi Chen To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Luca Ceresoli , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sandy Huang , =?UTF-8?q?Heiko=20St=C3=BCbner?= , Andy Yan , Vinod Koul , Chaoyi Chen , Sebastian Reichel , Nicolas Frattaroli Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-phy@lists.infradead.org Subject: [PATCH v3 4/5] drm/rockchip: cdn-dp: Support handle lane info without extcon Date: Fri, 17 Jul 2026 15:23:22 +0800 Message-Id: <20260717072323.96-5-kernel@airkyi.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20260717072323.96-1-kernel@airkyi.com> References: <20260717072323.96-1-kernel@airkyi.com> X-QQ-SENDSIZE: 520 Feedback-ID: esmtpsz:airkyi.com:qybglogicsvrgz:qybglogicsvrgz6b-0 X-QQ-XMAILINFO: NvH2zBBgt3uT+fxW0L8wrgVeJHt+jPWGxtbxNdaY5mB5M8UiKCT1jdwn anSfhTGt2+0RHgMoI2b8cliNlJ51vqCU//jY98UOzfoGgoF3irMP9eBStFzx3/IzfCC43Sq rJf4KCGmEow+Kj2IrfSIuT7b/0rWejwoawp75lygQKE2RLdCFOfd82fAmJYOKqWXqUd9hNU KQavgP45tZk6yRSCO4OxYiAnUXDDitHhPk1foD2MbBRihvpswJTbyJvNuDQOxPFLUpkG/OG snmgZM9q0YIEs51uhTL8TeO58+RXMP2r/CGzhZ0APRZZ2a2C3P3IaUqWNLXZSYrTZp14bxw 3SWfbpEpD5YLQKMdZm38rIW6RX5y1uYIlR6jKFPYTbdReytKMj7nQMdcfVTKVLuJWSySqlX nbZj2zJ5xpN53lQTlLbUuXLCH8hrDbs9oqjCj40+S2GRQ5Zoeejhy6p27DRcfRHYS78ttAY MytptmvTqeQd9Wv885tkC3Zwm5N2ueOw2WMJ/c22c+ygv2g4mvJKvjP9Wxbrcv+w83DDpu4 +7G6ZdiDG+6cx+d/6/S8qP5ekB33aZR7INUy4w5chZI4smbQ1Ye9Xv24p136iNrA/iwybO0 UkoXf6mhpacWO5tro3UCdqCIQca5qQuCN4xWGuMdkv9nN/bZdwonnjkCgvfjH2RN+Ivy2vs tSfvq9xj4XfVZpjymyQzqLXC1C7o9Hp00Ic8jjbhfljxRVHhlA+c9zNx7LvnUbp7+8yr+8Q gG5rKhy/z1yb3b16w5pEnO1sGira376gF7iA0CcW1oYOTHv/gQgnpqGF+Up5rhWMP99G1Fi 6YabBBkFDGrQwNhNqkgG0/m7zOveTRIqiUgq1yc6ij52GWD2jOl8qCbyk0J/DQhEQrA2KY0 QUnzooMycSChzfHBVQ0p+aMKD/rMQRYNCKRRq2yv4YRykiWKSObnTce+FJHWirlvND4cr0K DlmFOavxP+whOmMeyHCh0OO1lyLz+4iGHIO8Xoncj3Cadde8cAUSTNZG+pekVBneDwexVKR u4CSYL8hnsoTvk32+8XgTJa+EB7Z/alBWQplHg6g== X-QQ-XMRINFO: MPJ6Tf5t3I/ylTmHUqvI8+Wpn+Gzalws3A== X-QQ-RECHKSPAM: 0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Chaoyi Chen This patch add support for get PHY lane info without help of extcon. There is no extcon needed if the Type-C controller is present. In this case, the lane info can be get from PHY instead of extcon. The extcon device should still be supported if Type-C controller is not present. Signed-off-by: Chaoyi Chen Reviewed-by: Heiko Stuebner --- (no changes since v1) --- drivers/gpu/drm/rockchip/cdn-dp-core.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockc= hip/cdn-dp-core.c index 190cce9530c8..74e1f5422a6e 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c @@ -157,6 +157,9 @@ static int cdn_dp_get_port_lanes(struct cdn_dp_port *po= rt) int dptx; u8 lanes; =20 + if (!edev) + return phy_get_bus_width(port->phy); + dptx =3D extcon_get_state(edev, EXTCON_DISP_DP); if (dptx > 0) { extcon_get_property(edev, EXTCON_DISP_DP, @@ -220,7 +223,7 @@ static bool cdn_dp_check_sink_connection(struct cdn_dp_= device *dp) * some docks need more time to power up. */ while (time_before(jiffies, timeout)) { - if (!extcon_get_state(port->extcon, EXTCON_DISP_DP)) + if (port->extcon && !extcon_get_state(port->extcon, EXTCON_DISP_DP)) return false; =20 if (!cdn_dp_get_sink_count(dp, &sink_count)) @@ -386,11 +389,14 @@ static int cdn_dp_enable_phy(struct cdn_dp_device *dp= , struct cdn_dp_port *port) goto err_power_on; } =20 - ret =3D extcon_get_property(port->extcon, EXTCON_DISP_DP, - EXTCON_PROP_USB_TYPEC_POLARITY, &property); - if (ret) { - DRM_DEV_ERROR(dp->dev, "get property failed\n"); - goto err_power_on; + property.intval =3D 0; + if (port->extcon) { + ret =3D extcon_get_property(port->extcon, EXTCON_DISP_DP, + EXTCON_PROP_USB_TYPEC_POLARITY, &property); + if (ret) { + DRM_DEV_ERROR(dp->dev, "get property failed\n"); + goto err_power_on; + } } =20 port->lanes =3D cdn_dp_get_port_lanes(port); @@ -1027,6 +1033,9 @@ static int cdn_dp_bind(struct device *dev, struct dev= ice *master, void *data) for (i =3D 0; i < dp->ports; i++) { port =3D dp->port[i]; =20 + if (!port->extcon) + continue; + port->event_nb.notifier_call =3D cdn_dp_pd_event; ret =3D devm_extcon_register_notifier(dp->dev, port->extcon, EXTCON_DISP_DP, @@ -1119,14 +1128,14 @@ static int cdn_dp_probe(struct platform_device *pde= v) PTR_ERR(phy) =3D=3D -EPROBE_DEFER) return -EPROBE_DEFER; =20 - if (IS_ERR(extcon) || IS_ERR(phy)) + if (IS_ERR(phy) || PTR_ERR(extcon) !=3D -ENODEV) continue; =20 port =3D devm_kzalloc(dev, sizeof(*port), GFP_KERNEL); if (!port) return -ENOMEM; =20 - port->extcon =3D extcon; + port->extcon =3D IS_ERR(extcon) ? NULL : extcon; port->phy =3D phy; port->dp =3D dp; port->id =3D i; --=20 2.53.0 From nobody Sat Jul 25 05:59:35 2026 Received: from smtpbgbr2.qq.com (smtpbgbr2.qq.com [54.207.22.56]) (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 A14B9377567 for ; Fri, 17 Jul 2026 07:24:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=54.207.22.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784273061; cv=none; b=bicC6uYmevKmGdo6xxNsppu6AFYWBa8oit0egrMsvJnrK5xyF3psGnae9GUvK6TNw8NGb2H29XKzqxJ2IveEZrUOs0pz1E5+0j/EawEF6tqKH6Hh5CFVnkUzVKtD1QrzowGJt09NcsZXMpe4Xp5+zJ/f9ogPLX3vQXpJEUHUQZg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784273061; c=relaxed/simple; bh=vJVSsEciEZPLXk8DhZEQsUdGW4iBBkZeYby0mDJtsFQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=eEi1V9bTkDSIkNGHE2M4nfR838a/IWc4g0Q8FGBXcXGd35EwmDFs7SpDBowM7vezQtWit8MSJAIh7aYcKC7ONOYhJH4+1MCGYCXK8/L4hbdfJgoloNCHx+kPm9NHFpVNcu86SqbecJl9ShG04v2F0K30aX9yaCay+8ToSdEeVIk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=airkyi.com; spf=pass smtp.mailfrom=airkyi.com; dkim=pass (1024-bit key) header.d=airkyi.com header.i=@airkyi.com header.b=MBnjcfdp; arc=none smtp.client-ip=54.207.22.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=airkyi.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=airkyi.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=airkyi.com header.i=@airkyi.com header.b="MBnjcfdp" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=airkyi.com; s=altu2504; t=1784273048; bh=j1qGI17gBiKjAnJxkSNlL+YHKNdLbmrn/Viu89/+iEs=; h=From:To:Subject:Date:Message-Id; b=MBnjcfdp4SrUT4OQHq6plu+o5jDzPepvR2J4yL79+cnjAjuTieFX0ZmbWN1CTjzis fBFCsjMXM5gI7nlGvG9Q8PdCmcIWmxhUBzKSvHoFp1cRYzMwVnO6kNcjpeb5N6PfHf SKbk2avjCgzz/yll4vVIw50RxT9g2KYSsjJnfX0c= X-QQ-mid: esmtpsz21t1784273047tfd9a641e X-QQ-Originating-IP: YVSpA8sA7bq8LPsxhZftot5FqlpE40BV3BaH3sCv7c8= Received: from DESKTOP-8BT1A2O.localdomain ( [61.154.14.86]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 17 Jul 2026 15:23:58 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 2066741903968293985 From: Chaoyi Chen To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Luca Ceresoli , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sandy Huang , =?UTF-8?q?Heiko=20St=C3=BCbner?= , Andy Yan , Vinod Koul , Chaoyi Chen , Sebastian Reichel , Nicolas Frattaroli Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-phy@lists.infradead.org Subject: [PATCH v3 5/5] drm/rockchip: cdn-dp: Add multiple bridges to support PHY port selection Date: Fri, 17 Jul 2026 15:23:23 +0800 Message-Id: <20260717072323.96-6-kernel@airkyi.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20260717072323.96-1-kernel@airkyi.com> References: <20260717072323.96-1-kernel@airkyi.com> X-QQ-SENDSIZE: 520 Feedback-ID: esmtpsz:airkyi.com:qybglogicsvrgz:qybglogicsvrgz6b-0 X-QQ-XMAILINFO: MiV5tnKlHPKcuSfWV9EbmidivuXKgd6T9AD/1V6DcZW8zITtDaTTr4KV OnNmFhVBEsjUFfpfT5q+e/DqhLSUsdMe1HsyZTpklHMrN2PjaOkMZpIQ5Js8AIzVCTePZDm mh717b7v1l22e/uGbcsdcjDqOto0Ti1FnpLKvxh9hahGBga6VHaSzmoHdNM2Myukg56Mt8a Q1koIzl53cTy5GEQtRVsJaoLRe/FEZveMLYxUivtIeJha0nrpj2hinKFa243RxOusLHvi2P oWJd6nDm8lc7+9cCuIufMITw3YVavKNYX4AQwEQtjOLzdWFnxPbQ4sjyPW6eNsTmWxpf76T enFCjwEwtRHsK6P20LgMM2iHOVibs+MV+9uu1UyjFOntYpHGf2CpED7ca3n5p4QbnDZgre1 8txE7gPDty+wTYP0M9lJMURCCefp8VX75/l1T12P3aCgEwHJ5vKPJzV1pQ5P7Yuy03GoBws exnX4DL1OTPd4WN6vOVgVUXLWTN59d/jVJX+uUugAiVh/mduBFkXZVEcG3cW5FwZFe1M6Bb 4PewmHXUXgCZsu0oP+9Euq3v7oZmCnAPSqOU6KRjRSDJlojyF2Ep7frCgpwiobI6oxgDM9t f8U03iUJtpf4AIEkFeh73PHycVYtO5PcD2KgKdXiAximPspleizaSVfr+/7wgjeYKLAyiHC XAy54hrNFJDYZZeOd+v/2/cGVk3LRPBpWVp0U5LhZTEiH+36+sZt/4fC1w+P+h/rvyCyH4E hOQ0zgx2+AezpbHhOUGGwquuZeDBerfOdv+lyff9vE7K+wPcLUWfjvznrJH7gTo4HO4LIap Ymva/sC+yigoWMAwm3O9ZzoFZ1kBsIv9GcwGE2MQfErobJDmw2dykz1jJlAEbL3bZV+uFoa p68V0jgk0r41oNKxSiMy36pREhQMLRqR+a7AwT8/7H/+WXlNCHqgUYQU8rwCfxJnaVY/udf aGfqhwmTE8ABr+FA56e5O/bPkxvu94jPY7Rw4c1ZTH4n9fBQ+fKrq509gcJogIBnnWxZngW kKelgkRHtpzHY614K7Q9GQ+q/bV4q/zgnVgq4ApA== X-QQ-XMRINFO: MSVp+SPm3vtSI1QTLgDHQqIV1w2oNKDqfg== X-QQ-RECHKSPAM: 0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Chaoyi Chen The RK3399 has two USB/DP combo PHY and one CDN-DP controller. And the CDN-DP can be switched to output to one of the PHYs. If both ports are plugged into DP, DP will select the first port for output. This patch adds support for multiple bridges, enabling users to flexibly select the output port. For each PHY port, a separate encoder and bridge are registered. The change is based on the DRM AUX HPD bridge, rather than the extcon approach. This requires the DT to correctly describe the connections between the first bridge in bridge chain and DP controller. For example, the bridge chain may be like this: PHY aux birdge -> fsa4480 analog audio switch bridge -> onnn,nb7vpq904m USB reminder bridge -> USB-C controller AUX HPD bridge In this case, the connection relationships among the PHY aux bridge and the DP contorller need to be described in DT. In addition, the cdn_dp_parse_next_bridge_dt() will parses it and determines whether to register one or two bridges. Since there is only one DP controller, only one of the PHY ports can output at a time. The key is how to switch between different PHYs, which is handled by cdn_dp_switch_port() and cdn_dp_enable(). There are two cases: 1. Neither bridge is enabled. In this case, both bridges can independently read the EDID, and the PHY port may switch before reading the EDID. 2. One bridge is already enabled. In this case, other bridges are not allowed to read the EDID. So we will try to return the cached EDID. Since the scenario of two ports plug in at the same time is rare, I don't have a board which support two TypeC connector to test this. Therefore, I tested forced switching on a single PHY port, as well as output using a fake PHY port alongside a real PHY port. Signed-off-by: Chaoyi Chen Reviewed-by: Luca Ceresoli Reviewed-by: Heiko Stuebner --- Changes in v3: - Remove now-redundant call to drm_connector_attach_encoder() Changes in v2: - Fix the check logic for dp->active_port (0 is valid). - Fix the uninitialized prev_port. - Remove duplicate logic from cdn_dp_switch_port(). - Fix the prototype of cdn_dp_bridge_hpd_notify(). - Properly release connector->fwnode. - Properly release next_bridge. --- drivers/gpu/drm/rockchip/Kconfig | 1 + drivers/gpu/drm/rockchip/cdn-dp-core.c | 333 ++++++++++++++++++++----- drivers/gpu/drm/rockchip/cdn-dp-core.h | 18 +- 3 files changed, 294 insertions(+), 58 deletions(-) diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kc= onfig index e7f49fe845ea..ce70f91c13e6 100644 --- a/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig @@ -60,6 +60,7 @@ config ROCKCHIP_CDN_DP select DRM_DISPLAY_HELPER select DRM_BRIDGE_CONNECTOR select DRM_DISPLAY_DP_HELPER + select DRM_AUX_HPD_BRIDGE help This selects support for Rockchip SoC specific extensions for the cdn DP driver. If you want to enable Dp on diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockc= hip/cdn-dp-core.c index 74e1f5422a6e..5e513f6930cb 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c @@ -28,16 +28,17 @@ #include "cdn-dp-core.h" #include "cdn-dp-reg.h" =20 -static inline struct cdn_dp_device *bridge_to_dp(struct drm_bridge *bridge) +static int cdn_dp_switch_port(struct cdn_dp_device *dp, struct cdn_dp_port= *prev_port, + struct cdn_dp_port *port); + +static inline struct cdn_dp_bridge *bridge_to_dp_bridge(struct drm_bridge = *bridge) { - return container_of(bridge, struct cdn_dp_device, bridge); + return container_of(bridge, struct cdn_dp_bridge, bridge); } =20 -static inline struct cdn_dp_device *encoder_to_dp(struct drm_encoder *enco= der) +static inline struct cdn_dp_device *bridge_to_dp(struct drm_bridge *bridge) { - struct rockchip_encoder *rkencoder =3D to_rockchip_encoder(encoder); - - return container_of(rkencoder, struct cdn_dp_device, encoder); + return bridge_to_dp_bridge(bridge)->parent; } =20 #define GRF_SOC_CON9 0x6224 @@ -192,14 +193,27 @@ static int cdn_dp_get_sink_count(struct cdn_dp_device= *dp, u8 *sink_count) static struct cdn_dp_port *cdn_dp_connected_port(struct cdn_dp_device *dp) { struct cdn_dp_port *port; - int i, lanes; + int i, lanes[MAX_PHY]; =20 for (i =3D 0; i < dp->ports; i++) { port =3D dp->port[i]; - lanes =3D cdn_dp_get_port_lanes(port); - if (lanes) + lanes[i] =3D cdn_dp_get_port_lanes(port); + if (!dp->next_bridge_valid) return port; } + + if (dp->next_bridge_valid) { + /* If more than one port is available, pick the last active port */ + if (dp->active_port >=3D 0 && lanes[dp->active_port]) + return dp->port[dp->active_port]; + + /* If the last active port is not available, pick an available port in o= rder */ + for (i =3D 0; i < dp->bridge_count; i++) { + if (lanes[i]) + return dp->port[i]; + } + } + return NULL; } =20 @@ -254,12 +268,45 @@ static const struct drm_edid * cdn_dp_bridge_edid_read(struct drm_bridge *bridge, struct drm_connector *c= onnector) { struct cdn_dp_device *dp =3D bridge_to_dp(bridge); - const struct drm_edid *drm_edid; + struct cdn_dp_bridge *dp_bridge =3D bridge_to_dp_bridge(bridge); + struct cdn_dp_port *port =3D dp->port[dp_bridge->id]; + struct cdn_dp_port *prev_port =3D NULL; + const struct drm_edid *drm_edid =3D NULL; + int i, ret; =20 mutex_lock(&dp->lock); + + /* More than one port is available */ + if (dp->bridge_count > 1 && !port->phy_enabled) { + for (i =3D 0; i < dp->bridge_count; i++) { + /* Another port already enable */ + if (dp->bridge_list[i] !=3D dp_bridge && dp->bridge_list[i]->enabled) + goto get_cache; + /* Find already enabled port */ + if (dp->port[i]->phy_enabled) + prev_port =3D dp->port[i]; + } + + /* Switch to current port */ + if (prev_port) { + ret =3D cdn_dp_switch_port(dp, prev_port, port); + if (ret) + goto get_cache; + } + } + drm_edid =3D drm_edid_read_custom(connector, cdn_dp_get_edid_block, dp); + /* replace edid cache */ + if (dp->edid_cache[dp_bridge->id]) + drm_edid_free(dp->edid_cache[dp_bridge->id]); + dp->edid_cache[dp_bridge->id] =3D drm_edid_dup(drm_edid); + mutex_unlock(&dp->lock); + return drm_edid; =20 +get_cache: + drm_edid =3D drm_edid_dup(dp->edid_cache[dp_bridge->id]); + mutex_unlock(&dp->lock); return drm_edid; } =20 @@ -268,12 +315,13 @@ cdn_dp_bridge_mode_valid(struct drm_bridge *bridge, const struct drm_display_info *display_info, const struct drm_display_mode *mode) { + struct cdn_dp_bridge *dp_bridge =3D bridge_to_dp_bridge(bridge); struct cdn_dp_device *dp =3D bridge_to_dp(bridge); u32 requested, actual, rate, sink_max, source_max =3D 0; u8 lanes, bpc; =20 /* If DP is disconnected, every mode is invalid */ - if (!dp->connected) + if (!dp_bridge->connected || !dp->connected) return MODE_BAD; =20 switch (display_info->bpc) { @@ -551,6 +599,50 @@ static bool cdn_dp_check_link_status(struct cdn_dp_dev= ice *dp) return drm_dp_channel_eq_ok(link_status, min(port->lanes, sink_lanes)); } =20 +static int cdn_dp_switch_port(struct cdn_dp_device *dp, struct cdn_dp_port= *prev_port, + struct cdn_dp_port *port) +{ + int ret; + + ret =3D cdn_dp_disable_phy(dp, prev_port); + if (ret) + goto out; + ret =3D cdn_dp_enable_phy(dp, port); + if (ret) + goto out; + + ret =3D cdn_dp_get_sink_capability(dp); + if (ret) { + cdn_dp_disable_phy(dp, port); + goto out; + } + + dp->lanes =3D port->lanes; + + if (!cdn_dp_check_link_status(dp)) { + dev_info(dp->dev, "Connected with sink; re-train link\n"); + + ret =3D cdn_dp_train_link(dp); + if (ret) { + dev_err(dp->dev, "Training link failed: %d\n", ret); + goto out; + } + + ret =3D cdn_dp_set_video_status(dp, CONTROL_VIDEO_IDLE); + if (ret) { + dev_err(dp->dev, "Failed to idle video %d\n", ret); + goto out; + } + + ret =3D cdn_dp_config_video(dp); + if (ret) + dev_err(dp->dev, "Failed to configure video: %d\n", ret); + } + +out: + return ret; +} + static void cdn_dp_display_info_update(struct cdn_dp_device *dp, struct drm_display_info *display_info) { @@ -572,6 +664,7 @@ static void cdn_dp_display_info_update(struct cdn_dp_de= vice *dp, static void cdn_dp_bridge_atomic_enable(struct drm_bridge *bridge, struct = drm_atomic_commit *state) { struct cdn_dp_device *dp =3D bridge_to_dp(bridge); + struct cdn_dp_bridge *dp_bridge =3D bridge_to_dp_bridge(bridge); struct drm_connector *connector; int ret, val; =20 @@ -581,7 +674,7 @@ static void cdn_dp_bridge_atomic_enable(struct drm_brid= ge *bridge, struct drm_at =20 cdn_dp_display_info_update(dp, &connector->display_info); =20 - ret =3D drm_of_encoder_active_endpoint_id(dp->dev->of_node, &dp->encoder.= encoder); + ret =3D drm_of_encoder_active_endpoint_id(dp->dev->of_node, &dp_bridge->e= ncoder.encoder); if (ret < 0) { DRM_DEV_ERROR(dp->dev, "Could not get vop id, %d", ret); return; @@ -600,6 +693,9 @@ static void cdn_dp_bridge_atomic_enable(struct drm_brid= ge *bridge, struct drm_at =20 mutex_lock(&dp->lock); =20 + if (dp->next_bridge_valid) + dp->active_port =3D dp_bridge->id; + ret =3D cdn_dp_enable(dp); if (ret) { DRM_DEV_ERROR(dp->dev, "Failed to enable bridge %d\n", @@ -632,6 +728,7 @@ static void cdn_dp_bridge_atomic_enable(struct drm_brid= ge *bridge, struct drm_at goto out; } =20 + dp_bridge->enabled =3D true; out: mutex_unlock(&dp->lock); } @@ -639,9 +736,11 @@ static void cdn_dp_bridge_atomic_enable(struct drm_bri= dge *bridge, struct drm_at static void cdn_dp_bridge_atomic_disable(struct drm_bridge *bridge, struct= drm_atomic_commit *state) { struct cdn_dp_device *dp =3D bridge_to_dp(bridge); + struct cdn_dp_bridge *dp_bridge =3D bridge_to_dp_bridge(bridge); int ret; =20 mutex_lock(&dp->lock); + dp_bridge->enabled =3D false; =20 if (dp->active) { ret =3D cdn_dp_disable(dp); @@ -828,6 +927,17 @@ static int cdn_dp_audio_mute_stream(struct drm_bridge = *bridge, return ret; } =20 +static void cdn_dp_bridge_hpd_notify(struct drm_bridge *bridge, + struct drm_connector *connector, + enum drm_connector_status status) +{ + struct cdn_dp_bridge *dp_bridge =3D bridge_to_dp_bridge(bridge); + struct cdn_dp_device *dp =3D bridge_to_dp(bridge); + + dp->bridge_list[dp_bridge->id]->connected =3D status =3D=3D connector_sta= tus_connected; + schedule_work(&dp->event_work); +} + static const struct drm_bridge_funcs cdn_dp_bridge_funcs =3D { .atomic_duplicate_state =3D drm_atomic_helper_bridge_duplicate_state, .atomic_destroy_state =3D drm_atomic_helper_bridge_destroy_state, @@ -838,6 +948,7 @@ static const struct drm_bridge_funcs cdn_dp_bridge_func= s =3D { .atomic_disable =3D cdn_dp_bridge_atomic_disable, .mode_valid =3D cdn_dp_bridge_mode_valid, .mode_set =3D cdn_dp_bridge_mode_set, + .hpd_notify =3D cdn_dp_bridge_hpd_notify, =20 .dp_audio_prepare =3D cdn_dp_audio_prepare, .dp_audio_mute_stream =3D cdn_dp_audio_mute_stream, @@ -886,7 +997,8 @@ static void cdn_dp_pd_event_work(struct work_struct *wo= rk) { struct cdn_dp_device *dp =3D container_of(work, struct cdn_dp_device, event_work); - int ret; + bool connected; + int i, ret; =20 mutex_lock(&dp->lock); =20 @@ -945,9 +1057,12 @@ static void cdn_dp_pd_event_work(struct work_struct *= work) =20 out: mutex_unlock(&dp->lock); - drm_bridge_hpd_notify(&dp->bridge, - dp->connected ? connector_status_connected - : connector_status_disconnected); + for (i =3D 0; i < dp->bridge_count; i++) { + connected =3D dp->connected && dp->bridge_list[i]->connected; + drm_bridge_hpd_notify(&dp->bridge_list[i]->bridge, + connected ? connector_status_connected + : connector_status_disconnected); + } } =20 static int cdn_dp_pd_event(struct notifier_block *nb, @@ -967,28 +1082,16 @@ static int cdn_dp_pd_event(struct notifier_block *nb, return NOTIFY_DONE; } =20 -static int cdn_dp_bind(struct device *dev, struct device *master, void *da= ta) +static int cdn_bridge_add(struct device *dev, + struct drm_bridge *bridge, + struct drm_bridge *next_bridge, + struct drm_encoder *encoder) { struct cdn_dp_device *dp =3D dev_get_drvdata(dev); - struct drm_encoder *encoder; + struct drm_device *drm_dev =3D dp->drm_dev; + struct drm_bridge *last_bridge __free(drm_bridge_put) =3D NULL; struct drm_connector *connector; - struct cdn_dp_port *port; - struct drm_device *drm_dev =3D data; - int ret, i; - - ret =3D cdn_dp_parse_dt(dp); - if (ret < 0) - return ret; - - dp->drm_dev =3D drm_dev; - dp->connected =3D false; - dp->active =3D false; - dp->active_port =3D -1; - dp->fw_loaded =3D false; - - INIT_WORK(&dp->event_work, cdn_dp_pd_event_work); - - encoder =3D &dp->encoder.encoder; + int ret; =20 encoder->possible_crtcs =3D drm_of_find_possible_crtcs(drm_dev, dev->of_node); @@ -1003,26 +1106,35 @@ static int cdn_dp_bind(struct device *dev, struct d= evice *master, void *data) =20 drm_encoder_helper_add(encoder, &cdn_dp_encoder_helper_funcs); =20 - dp->bridge.ops =3D - DRM_BRIDGE_OP_DETECT | - DRM_BRIDGE_OP_EDID | - DRM_BRIDGE_OP_HPD | - DRM_BRIDGE_OP_DP_AUDIO; - dp->bridge.of_node =3D dp->dev->of_node; - dp->bridge.type =3D DRM_MODE_CONNECTOR_DisplayPort; - dp->bridge.hdmi_audio_dev =3D dp->dev; - dp->bridge.hdmi_audio_max_i2s_playback_channels =3D 8; - dp->bridge.hdmi_audio_spdif_playback =3D 1; - dp->bridge.hdmi_audio_dai_port =3D -1; - - ret =3D devm_drm_bridge_add(dev, &dp->bridge); + bridge->ops =3D + DRM_BRIDGE_OP_DETECT | + DRM_BRIDGE_OP_EDID | + DRM_BRIDGE_OP_HPD | + DRM_BRIDGE_OP_DP_AUDIO; + bridge->of_node =3D dp->dev->of_node; + bridge->type =3D DRM_MODE_CONNECTOR_DisplayPort; + bridge->hdmi_audio_dev =3D dp->dev; + bridge->hdmi_audio_max_i2s_playback_channels =3D 8; + bridge->hdmi_audio_spdif_playback =3D 1; + bridge->hdmi_audio_dai_port =3D -1; + + ret =3D devm_drm_bridge_add(dev, bridge); if (ret) return ret; =20 - ret =3D drm_bridge_attach(encoder, &dp->bridge, NULL, DRM_BRIDGE_ATTACH_N= O_CONNECTOR); + ret =3D drm_bridge_attach(encoder, bridge, NULL, DRM_BRIDGE_ATTACH_NO_CON= NECTOR); if (ret) return ret; =20 + if (next_bridge) { + ret =3D drm_bridge_attach(encoder, next_bridge, bridge, + DRM_BRIDGE_ATTACH_NO_CONNECTOR); + if (ret) + return ret; + + last_bridge =3D drm_bridge_chain_get_last_bridge(bridge->encoder); + } + connector =3D drm_bridge_connector_init(drm_dev, encoder); if (IS_ERR(connector)) { ret =3D PTR_ERR(connector); @@ -1030,6 +1142,101 @@ static int cdn_dp_bind(struct device *dev, struct d= evice *master, void *data) return ret; } =20 + if (last_bridge) { + fwnode_handle_put(connector->fwnode); + connector->fwnode =3D fwnode_handle_get(of_fwnode_handle(last_bridge->of= _node)); + } + + return 0; +} + +static int cdn_dp_parse_next_bridge_dt(struct cdn_dp_device *dp) +{ + struct device_node *np =3D dp->dev->of_node; + struct device_node *port __free(device_node) =3D of_graph_get_port_by_id(= np, 1); + struct drm_bridge *bridge; + int count =3D 0; + int ret =3D 0; + int i; + + /* If device use extcon, do not use hpd bridge */ + for (i =3D 0; i < dp->ports; i++) { + if (dp->port[i]->extcon) { + dp->bridge_count =3D 1; + return 0; + } + } + + /* One endpoint may correspond to one next bridge. */ + for_each_of_graph_port_endpoint(port, dp_ep) { + struct device_node *next_bridge_node __free(device_node) =3D + of_graph_get_remote_port_parent(dp_ep); + + bridge =3D of_drm_find_bridge(next_bridge_node); + if (!bridge) { + ret =3D -EPROBE_DEFER; + goto out; + } + + dp->next_bridge_valid =3D true; + dp->next_bridge_list[count] =3D drm_bridge_get(bridge); + count++; + } + +out: + dp->bridge_count =3D count ? count : 1; + return ret; +} + +static int cdn_dp_bind(struct device *dev, struct device *master, void *da= ta) +{ + struct cdn_dp_device *dp =3D dev_get_drvdata(dev); + struct drm_bridge *bridge, *next_bridge; + struct drm_encoder *encoder; + struct cdn_dp_port *port; + struct drm_device *drm_dev =3D data; + struct cdn_dp_bridge *dp_bridge; + int ret, i; + + ret =3D cdn_dp_parse_dt(dp); + if (ret < 0) + return ret; + + ret =3D cdn_dp_parse_next_bridge_dt(dp); + if (ret) + goto out; + + dp->drm_dev =3D drm_dev; + dp->connected =3D false; + dp->active =3D false; + dp->active_port =3D -1; + dp->fw_loaded =3D false; + + for (i =3D 0; i < dp->bridge_count; i++) { + dp_bridge =3D devm_drm_bridge_alloc(dev, struct cdn_dp_bridge, bridge, + &cdn_dp_bridge_funcs); + if (IS_ERR(dp_bridge)) { + ret =3D PTR_ERR(dp_bridge); + goto out; + } + dp_bridge->id =3D i; + dp_bridge->parent =3D dp; + if (!dp->next_bridge_valid) + dp_bridge->connected =3D true; + dp->bridge_list[i] =3D dp_bridge; + } + + for (i =3D 0; i < dp->bridge_count; i++) { + encoder =3D &dp->bridge_list[i]->encoder.encoder; + bridge =3D &dp->bridge_list[i]->bridge; + next_bridge =3D dp->next_bridge_list[i]; + ret =3D cdn_bridge_add(dev, bridge, next_bridge, encoder); + if (ret) + goto out; + } + + INIT_WORK(&dp->event_work, cdn_dp_pd_event_work); + for (i =3D 0; i < dp->ports; i++) { port =3D dp->port[i]; =20 @@ -1043,7 +1250,7 @@ static int cdn_dp_bind(struct device *dev, struct dev= ice *master, void *data) if (ret) { DRM_DEV_ERROR(dev, "register EXTCON_DISP_DP notifier err\n"); - return ret; + goto out; } } =20 @@ -1052,15 +1259,29 @@ static int cdn_dp_bind(struct device *dev, struct d= evice *master, void *data) schedule_work(&dp->event_work); =20 return 0; + +out: + for (i =3D 0; i < MAX_PHY; i++) + drm_bridge_put(dp->next_bridge_list[i]); + + return ret; } =20 static void cdn_dp_unbind(struct device *dev, struct device *master, void = *data) { struct cdn_dp_device *dp =3D dev_get_drvdata(dev); - struct drm_encoder *encoder =3D &dp->encoder.encoder; + struct drm_encoder *encoder; + int i; =20 cancel_work_sync(&dp->event_work); - encoder->funcs->destroy(encoder); + for (i =3D 0; i < dp->bridge_count; i++) { + encoder =3D &dp->bridge_list[i]->encoder.encoder; + encoder->funcs->destroy(encoder); + drm_bridge_put(dp->next_bridge_list[i]); + } + + for (i =3D 0; i < MAX_PHY; i++) + drm_edid_free(dp->edid_cache[i]); =20 pm_runtime_disable(dev); if (dp->fw_loaded) @@ -1111,10 +1332,10 @@ static int cdn_dp_probe(struct platform_device *pde= v) int ret; int i; =20 - dp =3D devm_drm_bridge_alloc(dev, struct cdn_dp_device, bridge, - &cdn_dp_bridge_funcs); - if (IS_ERR(dp)) - return PTR_ERR(dp); + dp =3D devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL); + if (!dp) + return -ENOMEM; + dp->dev =3D dev; =20 match =3D of_match_node(cdn_dp_dt_ids, pdev->dev.of_node); diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.h b/drivers/gpu/drm/rockc= hip/cdn-dp-core.h index e9c30b9fd543..c10e423bbf06 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.h +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.h @@ -38,6 +38,8 @@ enum vic_pxl_encoding_format { Y_ONLY =3D 0x10, }; =20 +struct cdn_dp_device; + struct video_info { bool h_sync_polarity; bool v_sync_polarity; @@ -63,16 +65,28 @@ struct cdn_dp_port { u8 id; }; =20 +struct cdn_dp_bridge { + struct cdn_dp_device *parent; + struct drm_bridge bridge; + struct rockchip_encoder encoder; + bool connected; + bool enabled; + int id; +}; + struct cdn_dp_device { struct device *dev; struct drm_device *drm_dev; - struct drm_bridge bridge; - struct rockchip_encoder encoder; + int bridge_count; + struct cdn_dp_bridge *bridge_list[MAX_PHY]; + struct drm_bridge *next_bridge_list[MAX_PHY]; + const struct drm_edid *edid_cache[MAX_PHY]; struct drm_display_mode mode; struct platform_device *audio_pdev; struct work_struct event_work; =20 struct mutex lock; + bool next_bridge_valid; bool connected; bool active; bool suspended; --=20 2.53.0