From: Chaoyi Chen <chaoyi.chen@rock-chips.com>
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 <chaoyi.chen@rock-chips.com>
---
Changes in v4:
- Remove cdn_dp_hpd_notify().
(no changes since v3)
Changes in v2:
- Ignore duplicate HPD events.
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/rockchip/cdn-dp-core.c
index b7e3f5dcf8d5..1e27301584a4 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -156,6 +156,9 @@ static int cdn_dp_get_port_lanes(struct cdn_dp_port *port)
int dptx;
u8 lanes;
+ if (!edev)
+ return phy_get_bus_width(port->phy);
+
dptx = extcon_get_state(edev, EXTCON_DISP_DP);
if (dptx > 0) {
extcon_get_property(edev, EXTCON_DISP_DP,
@@ -219,7 +222,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;
if (!cdn_dp_get_sink_count(dp, &sink_count))
@@ -385,11 +388,14 @@ static int cdn_dp_enable_phy(struct cdn_dp_device *dp, struct cdn_dp_port *port)
goto err_power_on;
}
- ret = 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 = 0;
+ if (port->extcon) {
+ ret = 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;
+ }
}
port->lanes = cdn_dp_get_port_lanes(port);
@@ -1028,6 +1034,9 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
for (i = 0; i < dp->ports; i++) {
port = dp->port[i];
+ if (!port->extcon)
+ continue;
+
port->event_nb.notifier_call = cdn_dp_pd_event;
ret = devm_extcon_register_notifier(dp->dev, port->extcon,
EXTCON_DISP_DP,
@@ -1120,14 +1129,14 @@ static int cdn_dp_probe(struct platform_device *pdev)
PTR_ERR(phy) == -EPROBE_DEFER)
return -EPROBE_DEFER;
- if (IS_ERR(extcon) || IS_ERR(phy))
+ if (IS_ERR(phy) || PTR_ERR(extcon) != -ENODEV)
continue;
port = devm_kzalloc(dev, sizeof(*port), GFP_KERNEL);
if (!port)
return -ENOMEM;
- port->extcon = extcon;
+ port->extcon = IS_ERR(extcon) ? NULL : extcon;
port->phy = phy;
port->dp = dp;
port->id = i;
--
2.49.0On Mon, Sep 22, 2025 at 09:20:36AM +0800, Chaoyi Chen wrote: > From: Chaoyi Chen <chaoyi.chen@rock-chips.com> > > 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 <chaoyi.chen@rock-chips.com> > --- > > Changes in v4: > - Remove cdn_dp_hpd_notify(). > > (no changes since v3) > > Changes in v2: > - Ignore duplicate HPD events. > > drivers/gpu/drm/rockchip/cdn-dp-core.c | 25 +++++++++++++++++-------- > 1 file changed, 17 insertions(+), 8 deletions(-) > > @@ -1120,14 +1129,14 @@ static int cdn_dp_probe(struct platform_device *pdev) > PTR_ERR(phy) == -EPROBE_DEFER) > return -EPROBE_DEFER; > > - if (IS_ERR(extcon) || IS_ERR(phy)) > + if (IS_ERR(phy) || PTR_ERR(extcon) != -ENODEV) > continue; This will break the case when the extcon is present. It should be (IS_ERR(extcon) && PTR_ERR(extcon) != -ENODEV) > > port = devm_kzalloc(dev, sizeof(*port), GFP_KERNEL); > if (!port) > return -ENOMEM; > > - port->extcon = extcon; > + port->extcon = IS_ERR(extcon) ? NULL : extcon; > port->phy = phy; > port->dp = dp; > port->id = i; > -- > 2.49.0 > -- With best wishes Dmitry
On 9/22/2025 6:01 PM, Dmitry Baryshkov wrote: > On Mon, Sep 22, 2025 at 09:20:36AM +0800, Chaoyi Chen wrote: >> From: Chaoyi Chen <chaoyi.chen@rock-chips.com> >> >> 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 <chaoyi.chen@rock-chips.com> >> --- >> >> Changes in v4: >> - Remove cdn_dp_hpd_notify(). >> >> (no changes since v3) >> >> Changes in v2: >> - Ignore duplicate HPD events. >> >> drivers/gpu/drm/rockchip/cdn-dp-core.c | 25 +++++++++++++++++-------- >> 1 file changed, 17 insertions(+), 8 deletions(-) >> >> @@ -1120,14 +1129,14 @@ static int cdn_dp_probe(struct platform_device *pdev) >> PTR_ERR(phy) == -EPROBE_DEFER) >> return -EPROBE_DEFER; >> >> - if (IS_ERR(extcon) || IS_ERR(phy)) >> + if (IS_ERR(phy) || PTR_ERR(extcon) != -ENODEV) >> continue; > This will break the case when the extcon is present. It should be > (IS_ERR(extcon) && PTR_ERR(extcon) != -ENODEV) Yes, will fix in v5 > >> >> port = devm_kzalloc(dev, sizeof(*port), GFP_KERNEL); >> if (!port) >> return -ENOMEM; >> >> - port->extcon = extcon; >> + port->extcon = IS_ERR(extcon) ? NULL : extcon; >> port->phy = phy; >> port->dp = dp; >> port->id = i; >> -- >> 2.49.0 >> -- Best, Chaoyi
© 2016 - 2025 Red Hat, Inc.