From nobody Sun Jun 14 14:30:09 2026 Received: from mail-m49237.qiye.163.com (mail-m49237.qiye.163.com [45.254.49.237]) (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 296C9309EFC for ; Fri, 3 Apr 2026 07:00:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.254.49.237 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775199648; cv=none; b=YU0i2ze/SzSOvPBYe1TX5mzGR3B9v+Kx4B2gOWThx8/wfIE7DFa6H1QxoJXWeWvsjpTYHgdOj1CzHO5shtBxwteG55W0lvRRgeABc5PPhezRxXL122pwYn8KCFu0YSnE2ycQVnC80p0R3/b/UTjStynVA0KJksm//tg006IE8/4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775199648; c=relaxed/simple; bh=TXvEZjlUj3Sq2WYVj3tEr9Jzpi5uvenll2o9QbBUFsc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HzXoB+ohDXCDex5EZNKSN/JoqZTmLZ6eLn6Nz4bDjb/7M6mlveYtbZdXZ8/aKtqxW4I2Sho0rC7P/6aZAzrjEoa7lgusD5cVRvxqQ10jbhyGh2/b38Ot0A0LJ1uB1dQKxElcXYEH7r5YAPBXMFGss4FAf4ilcOOhOQldVLHPjlo= 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=OlOoyejo; arc=none smtp.client-ip=45.254.49.237 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="OlOoyejo" Received: from zyb-HP-ProDesk-680-G2-MT.. (unknown [58.22.7.114]) by smtp.qiye.163.com (Hmail) with ESMTP id 396d58c6e; Fri, 3 Apr 2026 15:00:36 +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, hjc@rock-chips.com, heiko@sntech.de, andy.yan@rock-chips.com, wens@kernel.org, samuel@sholland.org, luca.ceresoli@bootlin.com Cc: Laurent.pinchart@ideasonboard.com, jonas@kwiboo.se, jernej.skrabec@gmail.com, victor.liu@nxp.com, dmitry.baryshkov@oss.qualcomm.com, shengjiu.wang@nxp.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-sunxi@lists.linux.dev, Damon Ding Subject: [PATCH v1 1/4] drm/bridge: dw-hdmi: Pass bridge attach flags for dw_hdmi_bind() Date: Fri, 3 Apr 2026 15:00:29 +0800 Message-Id: <20260403070032.447102-2-damon.ding@rock-chips.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260403070032.447102-1-damon.ding@rock-chips.com> References: <20260403070032.447102-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: 0a9d5224cc9f03a3kunm1d6b6bc811de6a X-HM-MType: 1 X-HM-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFDSUNOT01LS0k3V1ktWUFJV1kPCRoVCBIfWUFZGRlLHVZJGUIaGklMT0tOHh5WFRQJFh oXVRMBExYaEhckFA4PWVdZGBILWUFZTkNVSUlVTFVKSk9ZV1kWGg8SFR0UWUFZT0tIVUpLSU9PT0 hVSktLVUpCS0tZBg++ DKIM-Signature: a=rsa-sha256; b=OlOoyejoOkXGTU0c6apybdH7VloZYuymy3nY8UshMSA/uZrhmc5R0e/cHRqTMPPT4ts1ZuQHeZtwbl5PrhrJw/gbb17xqSbn8A58hlp6/36pSUmFjsTJo5DU0GsPN2VZxUpglrz+Vek1RK0D28zCnasPVmCr9eMpxEtc1kwl/7E=; s=default; c=relaxed/relaxed; d=rock-chips.com; v=1; bh=McMc5vAPh2G/cVqrH2p4ek7fEhv61YfNK/RtiS2LLiY=; h=date:mime-version:subject:message-id:from; Content-Type: text/plain; charset="utf-8" For Rockchip and Allwinner platforms, the HDMI encoder attaches the dw-hdmi bridge via dw_hdmi_bind(). This additional bridge attach flag serves as preparation for the Rockchip dw-hdmi driver to support the bridge-connector framework. Signed-off-by: Damon Ding --- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 5 +++-- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 2 +- drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 2 +- include/drm/bridge/dw_hdmi.h | 4 +++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/br= idge/synopsys/dw-hdmi.c index ada45e8b3e2c..dd50dda3a4f5 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -3619,7 +3619,8 @@ EXPORT_SYMBOL_GPL(dw_hdmi_remove); */ struct dw_hdmi *dw_hdmi_bind(struct platform_device *pdev, struct drm_encoder *encoder, - const struct dw_hdmi_plat_data *plat_data) + const struct dw_hdmi_plat_data *plat_data, + enum drm_bridge_attach_flags flags) { struct dw_hdmi *hdmi; int ret; @@ -3628,7 +3629,7 @@ struct dw_hdmi *dw_hdmi_bind(struct platform_device *= pdev, if (IS_ERR(hdmi)) return hdmi; =20 - ret =3D drm_bridge_attach(encoder, &hdmi->bridge, NULL, 0); + ret =3D drm_bridge_attach(encoder, &hdmi->bridge, NULL, flags); if (ret) { dw_hdmi_remove(hdmi); return ERR_PTR(ret); diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/= rockchip/dw_hdmi-rockchip.c index 0dc1eb5d2ae3..21b141b7cb9c 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -608,7 +608,7 @@ static int dw_hdmi_rockchip_bind(struct device *dev, st= ruct device *master, =20 platform_set_drvdata(pdev, hdmi); =20 - hdmi->hdmi =3D dw_hdmi_bind(pdev, encoder, plat_data); + hdmi->hdmi =3D dw_hdmi_bind(pdev, encoder, plat_data, 0); =20 /* * If dw_hdmi_bind() fails we'll never call dw_hdmi_unbind(), diff --git a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c b/drivers/gpu/drm/sun4i/= sun8i_dw_hdmi.c index 96532709c2a7..04173335f7e7 100644 --- a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c +++ b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c @@ -188,7 +188,7 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struc= t device *master, =20 platform_set_drvdata(pdev, hdmi); =20 - hdmi->hdmi =3D dw_hdmi_bind(pdev, encoder, plat_data); + hdmi->hdmi =3D dw_hdmi_bind(pdev, encoder, plat_data, 0); =20 /* * If dw_hdmi_bind() fails we'll never call dw_hdmi_unbind(), diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h index 8500dd4f99d8..e789fb451ef2 100644 --- a/include/drm/bridge/dw_hdmi.h +++ b/include/drm/bridge/dw_hdmi.h @@ -6,6 +6,7 @@ #ifndef __DW_HDMI__ #define __DW_HDMI__ =20 +#include #include =20 struct drm_display_info; @@ -182,7 +183,8 @@ void dw_hdmi_remove(struct dw_hdmi *hdmi); void dw_hdmi_unbind(struct dw_hdmi *hdmi); struct dw_hdmi *dw_hdmi_bind(struct platform_device *pdev, struct drm_encoder *encoder, - const struct dw_hdmi_plat_data *plat_data); + const struct dw_hdmi_plat_data *plat_data, + enum drm_bridge_attach_flags flags); =20 void dw_hdmi_resume(struct dw_hdmi *hdmi); =20 --=20 2.34.1 From nobody Sun Jun 14 14:30:09 2026 Received: from mail-m49235.qiye.163.com (mail-m49235.qiye.163.com [45.254.49.235]) (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 46D6418DB01 for ; Fri, 3 Apr 2026 07:05:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.254.49.235 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775199961; cv=none; b=r9NgzMibyF9E/d9Ket9pMf5KOh1TT02bBhhdD9bpXaQIMqmtNAHygikjB8b9t4QvXEIWChJsfNkCtdVM9lEKHvZv7wdXB4w4Twk+/md125Ouk8yGYNLQ6Qdlp09f8xhgnEx6K76pMnq+YzqKa6jmZ7BVFrbw1/faexjbCz+l81Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775199961; c=relaxed/simple; bh=tht/dT+WlcrNaVxweAiPJgOXdNqpqyghSF9yw4dIYO4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XxVDIY4DK2QMb73mUEHxvPOXDbKfIZnHk4Lty5+Pl8dxzp9wdrwlBKijHGG4ApZXC6Zd1Ta70awdMRyPM7RotryU5fNBzJh7yBvyKfuKwl8dge38uDzFVJ0FHhSip5KGpRGmNgv4apzuvgbNiCx+vqnVnWBALaQojt4VJZ7TJAs= 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=a3czWbbN; arc=none smtp.client-ip=45.254.49.235 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="a3czWbbN" Received: from zyb-HP-ProDesk-680-G2-MT.. (unknown [58.22.7.114]) by smtp.qiye.163.com (Hmail) with ESMTP id 396d58c7b; Fri, 3 Apr 2026 15:00:38 +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, hjc@rock-chips.com, heiko@sntech.de, andy.yan@rock-chips.com, wens@kernel.org, samuel@sholland.org, luca.ceresoli@bootlin.com Cc: Laurent.pinchart@ideasonboard.com, jonas@kwiboo.se, jernej.skrabec@gmail.com, victor.liu@nxp.com, dmitry.baryshkov@oss.qualcomm.com, shengjiu.wang@nxp.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-sunxi@lists.linux.dev, Damon Ding Subject: [PATCH v1 2/4] drm/bridge: dw-hdmi: Allow &dw_hdmi_plat_data.output_port = 0 without DRM_BRIDGE_ATTACH_NO_CONNECTOR Date: Fri, 3 Apr 2026 15:00:30 +0800 Message-Id: <20260403070032.447102-3-damon.ding@rock-chips.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260403070032.447102-1-damon.ding@rock-chips.com> References: <20260403070032.447102-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: 0a9d5224d3e103a3kunm1d6b6bc811de8c X-HM-MType: 1 X-HM-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFDSUNOT01LS0k3V1ktWUFJV1kPCRoVCBIfWUFZGh4eHVZDSBpJSE8YT09PSkhWFRQJFh oXVRMBExYaEhckFA4PWVdZGBILWUFZTkNVSUlVTFVKSk9ZV1kWGg8SFR0UWUFZT0tIVUpLSU9PT0 hVSktLVUpCS0tZBg++ DKIM-Signature: a=rsa-sha256; b=a3czWbbNA5bRxbuC+yj8HGXru+0VhED5jHr8yHMEfFFY6t7unzRDodHsLfmDyeRad9b/QdfUJzGJ3Smi7907Aro4Xl9VnWC2+x1KmIVJCb0ntGB2hpB9P/2tQukCKhE58S7ylyU2NlUI9MJ1OAzPunQBSCUK+B3nNmdoWub9CRQ=; s=default; c=relaxed/relaxed; d=rock-chips.com; v=1; bh=7YFq+k4oWEJWI7D226Mei8EZK2WhHcRNVgZytreS/T0=; h=date:mime-version:subject:message-id:from; Content-Type: text/plain; charset="utf-8" In the previous commit, Luca split the dw-hdmi attach process into two cases: A. hdmi->plat_data->output_port =3D 0: the HDMI output (port@1) in device tree is not used B. hdmi->plat_data->output_port =3D 1: the HDMI output (port@1) is parsed to find the next bridge For Rockchip, many older platforms (RK3288, RK3399, etc.) only support case A by default. They can support DRM_BRIDGE_ATTACH_NO_CONNECTOR flag after adapting to the bridge connector helper. Relax this constraint in preparation for Rockchip dw-hdmi bridge-connector adaptation. Link: https://lore.kernel.org/all/20260402-drm-lcdif-dbanc-v3-6-27cd247a084= 7@bootlin.com/ Signed-off-by: Damon Ding --- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/br= idge/synopsys/dw-hdmi.c index dd50dda3a4f5..20b2f9e145b0 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -2912,9 +2912,8 @@ static int dw_hdmi_bridge_attach(struct drm_bridge *b= ridge, { struct dw_hdmi *hdmi =3D bridge->driver_private; =20 - /* DRM_BRIDGE_ATTACH_NO_CONNECTOR requires a remote-endpoint to the next = bridge */ - if (WARN_ON((flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) && !hdmi->plat_data-= >output_port)) - return -EINVAL; + if ((flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) && !hdmi->plat_data->output_= port) + return 0; =20 if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) { struct device_node *remote __free(device_node) =3D --=20 2.34.1 From nobody Sun Jun 14 14:30:09 2026 Received: from mail-m49196.qiye.163.com (mail-m49196.qiye.163.com [45.254.49.196]) (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 AC84D378839 for ; Fri, 3 Apr 2026 07:00:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.254.49.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775199652; cv=none; b=Z32ccSsdT+t53ME+fALJiVyuD1evAyoMoeReKiTwXzr1i020h/f4ZhfFdiRnqoVNNkBzAIoK7eJwDntAJSFk5P74kaO+ib8KNHwW+jmdxfGcpFCGXC/yVHxXVp9dhwke2/RDBFuSI6JBkBlGsUPp2c2xzQWvgVo0FfsjDDRRZOk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775199652; c=relaxed/simple; bh=8ri0OPoY/KW3G5nM4FSVP2/vHev0+96L0cNC21OcTwc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RXCaFwranUDXEHJ8S5JFw+v7f8Ww89wP8KKz+d8a7EjIoj+AOcpSePqWVaPklPEsmwnQJhpcrHAROL7ELcYbGJX4H0i5UFia2NJgzbvDRRqcCgMrnuEW0WjDiB6v1OYl0S+JFuP0XnpxQ7eOn0H/nsg9XnWYZVju/inkFqfuTjA= 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=MTggQTmp; arc=none smtp.client-ip=45.254.49.196 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="MTggQTmp" Received: from zyb-HP-ProDesk-680-G2-MT.. (unknown [58.22.7.114]) by smtp.qiye.163.com (Hmail) with ESMTP id 396d58c8f; Fri, 3 Apr 2026 15:00:40 +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, hjc@rock-chips.com, heiko@sntech.de, andy.yan@rock-chips.com, wens@kernel.org, samuel@sholland.org, luca.ceresoli@bootlin.com Cc: Laurent.pinchart@ideasonboard.com, jonas@kwiboo.se, jernej.skrabec@gmail.com, victor.liu@nxp.com, dmitry.baryshkov@oss.qualcomm.com, shengjiu.wang@nxp.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-sunxi@lists.linux.dev, Damon Ding Subject: [PATCH v1 3/4] drm/rockchip: dw_hdmi: Apply DRM_BRIDGE_ATTACH_NO_CONNECTOR and the bridge-connector Date: Fri, 3 Apr 2026 15:00:31 +0800 Message-Id: <20260403070032.447102-4-damon.ding@rock-chips.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260403070032.447102-1-damon.ding@rock-chips.com> References: <20260403070032.447102-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: 0a9d5224db2703a3kunm1d6b6bc811deb5 X-HM-MType: 1 X-HM-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFDSUNOT01LS0k3V1ktWUFJV1kPCRoVCBIfWUFZQx4ZGlZJSR1LQx5KSUpOHUlWFRQJFh oXVRMBExYaEhckFA4PWVdZGBILWUFZTkNVSUlVTFVKSk9ZV1kWGg8SFR0UWUFZT0tIVUpLSU9PT0 hVSktLVUpCS0tZBg++ DKIM-Signature: a=rsa-sha256; b=MTggQTmpvpDAkUCTK+phVdqDF0DwSlKrX4o0Bg/D6d8/YgiJQvd2U4TtW6aulksm8kWQCkkqT/Ro3s7iM9nTfEtoe5vhyLxHKXrEjMWzebV5O55UTD9Pdo/33xyT4OzM8T64sJq1OVNcHA+xnQTvFkBOxlhy0fryPFt2AjdYZDk=; s=default; c=relaxed/relaxed; d=rock-chips.com; v=1; bh=sFB8BBIFFL7jpCc3yoYdeIALzzlxyXt+AtPHpod/PGU=; h=date:mime-version:subject:message-id:from; Content-Type: text/plain; charset="utf-8" Convert this driver to DRM_BRIDGE_ATTACH_NO_CONNECTOR and to the drm_bridge_connector framework which is the current DRM bridge best practice. Signed-off-by: Damon Ding --- drivers/gpu/drm/rockchip/Kconfig | 1 + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kc= onfig index e7f49fe845ea..69b832d0c8c4 100644 --- a/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig @@ -76,6 +76,7 @@ config ROCKCHIP_DW_DP =20 config ROCKCHIP_DW_HDMI bool "Rockchip specific extensions for Synopsys DW HDMI" + select DRM_BRIDGE_CONNECTOR help This selects support for Rockchip SoC specific extensions for the Synopsys DesignWare HDMI driver. If you want to diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/= rockchip/dw_hdmi-rockchip.c index 21b141b7cb9c..b5cfcb936078 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -13,6 +13,7 @@ #include =20 #include +#include #include #include #include @@ -542,6 +543,7 @@ static int dw_hdmi_rockchip_bind(struct device *dev, st= ruct device *master, struct drm_device *drm =3D data; struct drm_encoder *encoder; struct rockchip_hdmi *hdmi; + struct drm_connector *connector; int ret; =20 if (!pdev->dev.of_node) @@ -608,7 +610,7 @@ static int dw_hdmi_rockchip_bind(struct device *dev, st= ruct device *master, =20 platform_set_drvdata(pdev, hdmi); =20 - hdmi->hdmi =3D dw_hdmi_bind(pdev, encoder, plat_data, 0); + hdmi->hdmi =3D dw_hdmi_bind(pdev, encoder, plat_data, DRM_BRIDGE_ATTACH_N= O_CONNECTOR); =20 /* * If dw_hdmi_bind() fails we'll never call dw_hdmi_unbind(), @@ -616,12 +618,21 @@ static int dw_hdmi_rockchip_bind(struct device *dev, = struct device *master, */ if (IS_ERR(hdmi->hdmi)) { ret =3D PTR_ERR(hdmi->hdmi); - goto err_bind; + goto err_cleanup_encoder; } =20 - return 0; + connector =3D drm_bridge_connector_init(drm, encoder); + if (IS_ERR(connector)) { + ret =3D PTR_ERR(connector); + dev_err(hdmi->dev, "Failed to initialize bridge_connector\n"); + goto err_unbind_bridge; + } =20 -err_bind: + return drm_connector_attach_encoder(connector, encoder); + +err_unbind_bridge: + dw_hdmi_unbind(hdmi->hdmi); +err_cleanup_encoder: drm_encoder_cleanup(encoder); =20 return ret; --=20 2.34.1 From nobody Sun Jun 14 14:30:09 2026 Received: from mail-m1973181.qiye.163.com (mail-m1973181.qiye.163.com [220.197.31.81]) (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 CB6F8332EC8 for ; Fri, 3 Apr 2026 07:00:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.81 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775199658; cv=none; b=dGu42a7OOx8EWbxKOE+dzXUfv/FIgvjL87RitcV0iuGwcmzxa1bc7mOlLr8EtA3SwUBptouZHdJx0lTUyZvPZLDo21eZVqgQ0ptZoLCp6OLFkkbHx3gux8CyNVFgL5UZJ14AkzzssEadIhi1RCybxYg/iWLXFspzjGz9p72xkIA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775199658; c=relaxed/simple; bh=mM4aNqvWc5A95bsk94szTpIl5yxidk7QDxh2g1sh4ww=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kYRxQPsfPqbUL0sZWI6n7DWetu9VOOghegUsy+slmuMfcbe1eaTeBWRHlKj3S8CAM7IMyw0khIpo00IE71NKLA6vVWCN4Kruow5i9vOkdxEdqplRbn2W+sKq2UdViBCNrTIytFZ38aGLYBV+XOqQugSxI6f6a87Fm6EHYjDL8KE= 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=aFs31TTZ; arc=none smtp.client-ip=220.197.31.81 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="aFs31TTZ" Received: from zyb-HP-ProDesk-680-G2-MT.. (unknown [58.22.7.114]) by smtp.qiye.163.com (Hmail) with ESMTP id 396d58c9f; Fri, 3 Apr 2026 15:00:42 +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, hjc@rock-chips.com, heiko@sntech.de, andy.yan@rock-chips.com, wens@kernel.org, samuel@sholland.org, luca.ceresoli@bootlin.com Cc: Laurent.pinchart@ideasonboard.com, jonas@kwiboo.se, jernej.skrabec@gmail.com, victor.liu@nxp.com, dmitry.baryshkov@oss.qualcomm.com, shengjiu.wang@nxp.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-sunxi@lists.linux.dev, Damon Ding Subject: [PATCH v1 4/4] drm/rockchip: dw_hdmi: Support to find the next bridge Date: Fri, 3 Apr 2026 15:00:32 +0800 Message-Id: <20260403070032.447102-5-damon.ding@rock-chips.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260403070032.447102-1-damon.ding@rock-chips.com> References: <20260403070032.447102-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: 0a9d5224e24f03a3kunm1d6b6bc811ded4 X-HM-MType: 1 X-HM-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFDSUNOT01LS0k3V1ktWUFJV1kPCRoVCBIfWUFZGhkeTFZIQ09NQ0hKSktLHR5WFRQJFh oXVRMBExYaEhckFA4PWVdZGBILWUFZTkNVSUlVTFVKSk9ZV1kWGg8SFR0UWUFZT0tIVUpLSU9PT0 hVSktLVUpCS0tZBg++ DKIM-Signature: a=rsa-sha256; b=aFs31TTZtr+bCfSkmGEJmc0xRV7zEwxDbZrhSC+mQNg0U67RwMRuJMxl4yptVlC6kZi5QRfl2dSs3ey2cwYI+2sXDp6VJgBZEO9JDJITLh/JRY5CKD1HhV4l/ODhISn/XFR3t4jpqT9q9y/19yiV87id2R+hDfWQw9s+LbJU9AY=; s=default; c=relaxed/relaxed; d=rock-chips.com; v=1; bh=qhMDeS5MJsqMangPhhuZJQL2DTnTsaxRf2SE3asViXM=; h=date:mime-version:subject:message-id:from; Content-Type: text/plain; charset="utf-8" If there is a remote node connected to the HDMI output (port@1), the &dw_hdmi_plat_data.output_port should be set to 1. This patch allows Rockchip dw-hdmi to support the hdmi-connector and the next bridge. Signed-off-by: Damon Ding --- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/= rockchip/dw_hdmi-rockchip.c index b5cfcb936078..014ac09fd733 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -544,6 +544,8 @@ static int dw_hdmi_rockchip_bind(struct device *dev, st= ruct device *master, struct drm_encoder *encoder; struct rockchip_hdmi *hdmi; struct drm_connector *connector; + struct device_node *remote; + struct drm_bridge *next_bridge; int ret; =20 if (!pdev->dev.of_node) @@ -610,6 +612,18 @@ static int dw_hdmi_rockchip_bind(struct device *dev, s= truct device *master, =20 platform_set_drvdata(pdev, hdmi); =20 + remote =3D of_graph_get_remote_node(hdmi->dev->of_node, 1, -1); + if (remote) { + of_node_put(remote); + + ret =3D drm_of_find_panel_or_bridge(hdmi->dev->of_node, 1, 0, + NULL, &next_bridge); + if (ret && ret !=3D -ENODEV) + goto err_cleanup_encoder; + + plat_data->output_port =3D 1; + } + hdmi->hdmi =3D dw_hdmi_bind(pdev, encoder, plat_data, DRM_BRIDGE_ATTACH_N= O_CONNECTOR); =20 /* --=20 2.34.1