* [PATCH 1/4] drm/bridge: synopsys: dw-hdmi-qp: Propagate the bus format to the bridge input
2026-11-18 21:45 [PATCH 0/4] drm/bridge: dw-hdmi-qp: Fix HDMI output on H96 MAX V58 board Joachim Eastwood via B4 Relay
@ 2026-11-18 21:45 ` Joachim Eastwood via B4 Relay
2026-11-18 21:45 ` [PATCH 2/4] drm/bridge: synopsys: dw-hdmi-qp: Attach the next bridge in the chain Joachim Eastwood via B4 Relay
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Joachim Eastwood via B4 Relay @ 2026-11-18 21:45 UTC (permalink / raw)
To: Sandy Huang, Heiko Stübner, Andy Yan, Andrzej Hajda,
Neil Armstrong, Robert Foss, Laurent Pinchart, Jonas Karlman,
Jernej Skrabec, Luca Ceresoli, Maarten Lankhorst, Maxime Ripard,
Thomas Zimmermann, David Airlie, Simona Vetter, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Alexey Charkov,
Cristian Ciocaltea, Nicolas Frattaroli
Cc: dri-devel, linux-rockchip, devicetree, linux-arm-kernel,
Joachim Eastwood
From: Joachim Eastwood <joachim.eastwood@gmail.com>
Propagate the output format to the input, so the negotiated format is
available no matter what follows the bridge. There is no functional
change when dw-hdmi-qp is the last bridge, as the glue already uses the
output format in that case.
Signed-off-by: Joachim Eastwood <joachim.eastwood@gmail.com>
---
drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
index 9842209288369..eed249aca1e23 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
@@ -1026,6 +1026,7 @@ static void dw_hdmi_qp_bridge_hpd_disable(struct drm_bridge *bridge)
static const struct drm_bridge_funcs dw_hdmi_qp_bridge_funcs = {
.atomic_get_output_bus_fmts = drm_atomic_helper_bridge_get_hdmi_output_bus_fmts,
+ .atomic_get_input_bus_fmts = drm_atomic_helper_bridge_propagate_bus_fmt,
.atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
.atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
.atomic_create_state = drm_atomic_helper_bridge_create_state,
--
2.56.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] drm/bridge: synopsys: dw-hdmi-qp: Attach the next bridge in the chain
2026-11-18 21:45 [PATCH 0/4] drm/bridge: dw-hdmi-qp: Fix HDMI output on H96 MAX V58 board Joachim Eastwood via B4 Relay
2026-11-18 21:45 ` [PATCH 1/4] drm/bridge: synopsys: dw-hdmi-qp: Propagate the bus format to the bridge input Joachim Eastwood via B4 Relay
@ 2026-11-18 21:45 ` Joachim Eastwood via B4 Relay
2026-11-18 22:05 ` sashiko-bot
2026-11-18 21:45 ` [PATCH 3/4] arm64: dts: rockchip: use i2c-gpio for hdmi ddc on rk3588-h96-max-v58 Joachim Eastwood via B4 Relay
2026-11-18 21:45 ` [PATCH 4/4] arm64: dts: rockchip: enable hdmi sound " Joachim Eastwood via B4 Relay
3 siblings, 1 reply; 6+ messages in thread
From: Joachim Eastwood via B4 Relay @ 2026-11-18 21:45 UTC (permalink / raw)
To: Sandy Huang, Heiko Stübner, Andy Yan, Andrzej Hajda,
Neil Armstrong, Robert Foss, Laurent Pinchart, Jonas Karlman,
Jernej Skrabec, Luca Ceresoli, Maarten Lankhorst, Maxime Ripard,
Thomas Zimmermann, David Airlie, Simona Vetter, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Alexey Charkov,
Cristian Ciocaltea, Nicolas Frattaroli
Cc: dri-devel, linux-rockchip, devicetree, linux-arm-kernel,
Joachim Eastwood
From: Joachim Eastwood <joachim.eastwood@gmail.com>
Implement the drm_bridge_funcs attach function so dw-hdmi-qp will attach
to the next bridge in the chain. This will allow the properties on the
next bridge be used. In the case of hdmi-connector this will make
properties like ddc-i2c-bus and hpd-gpios can override the on-chip
functions in dw-hdmi-qp.
Signed-off-by: Joachim Eastwood <joachim.eastwood@gmail.com>
---
drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 30 ++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
index eed249aca1e23..200229e5d9afc 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
@@ -16,6 +16,7 @@
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/of.h>
+#include <linux/of_graph.h>
#include <drm/bridge/dw_hdmi_qp.h>
#include <drm/display/drm_hdmi_helper.h>
@@ -39,6 +40,9 @@
#define DDC_CI_ADDR 0x37
#define DDC_SEGMENT_ADDR 0x30
+/* OF graph port carrying the output towards the HDMI connector */
+#define DW_HDMI_QP_OUTPUT_PORT 1
+
struct dw_hdmi_qp_i2c {
struct i2c_adapter adap;
@@ -1024,7 +1028,33 @@ static void dw_hdmi_qp_bridge_hpd_disable(struct drm_bridge *bridge)
hdmi->phy.ops->disable_hpd(hdmi, hdmi->phy.data);
}
+static int dw_hdmi_qp_bridge_attach(struct drm_bridge *bridge,
+ struct drm_encoder *encoder,
+ enum drm_bridge_attach_flags flags)
+{
+ struct dw_hdmi_qp *hdmi = bridge->driver_private;
+ struct device_node *remote __free(device_node) =
+ of_graph_get_remote_node(hdmi->dev->of_node,
+ DW_HDMI_QP_OUTPUT_PORT, -1);
+
+ /*
+ * The HDMI connector node is optional. When present, chain its bridge
+ * so that properties such as ddc-i2c-bus, hpd-gpios and supplies are
+ * honoured by the DRM bridge connector.
+ */
+ if (!remote)
+ return 0;
+
+ struct drm_bridge *next_bridge __free(drm_bridge_put) =
+ of_drm_find_and_get_bridge(remote);
+ if (!next_bridge)
+ return -EPROBE_DEFER;
+
+ return drm_bridge_attach(encoder, next_bridge, bridge, flags);
+}
+
static const struct drm_bridge_funcs dw_hdmi_qp_bridge_funcs = {
+ .attach = dw_hdmi_qp_bridge_attach,
.atomic_get_output_bus_fmts = drm_atomic_helper_bridge_get_hdmi_output_bus_fmts,
.atomic_get_input_bus_fmts = drm_atomic_helper_bridge_propagate_bus_fmt,
.atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
--
2.56.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/4] drm/bridge: synopsys: dw-hdmi-qp: Attach the next bridge in the chain
2026-11-18 21:45 ` [PATCH 2/4] drm/bridge: synopsys: dw-hdmi-qp: Attach the next bridge in the chain Joachim Eastwood via B4 Relay
@ 2026-11-18 22:05 ` sashiko-bot
0 siblings, 0 replies; 6+ messages in thread
From: sashiko-bot @ 2026-11-18 22:05 UTC (permalink / raw)
To: Joachim Eastwood; +Cc: dri-devel, devicetree, robh, conor+dt
Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [High] drm/bridge: dw-hdmi-qp: missing DRM_DISPLAY_CONNECTOR Kconfig
select
--
commit 2fdd511539969260584719b2d1604f9b1b9ed26e
Author: Joachim Eastwood <joachim.eastwood@gmail.com>
drm/bridge: synopsys: dw-hdmi-qp: Attach the next bridge in the chain
This commit implements drm_bridge_funcs.attach for dw-hdmi-qp to look up and
attach the next bridge connected to output port 1.
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
> index eed249aca1e23..200229e5d9afc 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
[ ... ]
> @@ -1024,7 +1028,33 @@ static void dw_hdmi_qp_bridge_hpd_disable(struct drm_bridge *bridge)
> hdmi->phy.ops->disable_hpd(hdmi, hdmi->phy.data);
> }
>
> +static int dw_hdmi_qp_bridge_attach(struct drm_bridge *bridge,
> + struct drm_encoder *encoder,
> + enum drm_bridge_attach_flags flags)
> +{
> + struct dw_hdmi_qp *hdmi = bridge->driver_private;
> + struct device_node *remote __free(device_node) =
> + of_graph_get_remote_node(hdmi->dev->of_node,
> + DW_HDMI_QP_OUTPUT_PORT, -1);
> +
> + /*
> + * The HDMI connector node is optional. When present, chain its bridge
> + * so that properties such as ddc-i2c-bus, hpd-gpios and supplies are
> + * honoured by the DRM bridge connector.
> + */
> + if (!remote)
> + return 0;
> +
> + struct drm_bridge *next_bridge __free(drm_bridge_put) =
> + of_drm_find_and_get_bridge(remote);
> + if (!next_bridge)
> + return -EPROBE_DEFER;
[Severity: High]
Should DRM_DW_HDMI_QP (or ROCKCHIP_DW_HDMI_QP) select DRM_DISPLAY_CONNECTOR
in Kconfig?
All in-tree RK3576 and RK3588 board device trees wire port 1 to an
"hdmi-connector" node, which is handled by display-connector.c under
CONFIG_DRM_DISPLAY_CONNECTOR. Neither DRM_DW_HDMI_QP nor
ROCKCHIP_DW_HDMI_QP selects DRM_DISPLAY_CONNECTOR, so configs that previously
worked without it will now have of_drm_find_and_get_bridge() return NULL and
defer probe forever, preventing rockchip_drm_bind() from binding the display
subsystem.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261118-dw-hdmi-qp-bridge_attach-v1-0-e370920bc7f3@gmail.com?part=2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/4] arm64: dts: rockchip: use i2c-gpio for hdmi ddc on rk3588-h96-max-v58
2026-11-18 21:45 [PATCH 0/4] drm/bridge: dw-hdmi-qp: Fix HDMI output on H96 MAX V58 board Joachim Eastwood via B4 Relay
2026-11-18 21:45 ` [PATCH 1/4] drm/bridge: synopsys: dw-hdmi-qp: Propagate the bus format to the bridge input Joachim Eastwood via B4 Relay
2026-11-18 21:45 ` [PATCH 2/4] drm/bridge: synopsys: dw-hdmi-qp: Attach the next bridge in the chain Joachim Eastwood via B4 Relay
@ 2026-11-18 21:45 ` Joachim Eastwood via B4 Relay
2026-11-18 21:45 ` [PATCH 4/4] arm64: dts: rockchip: enable hdmi sound " Joachim Eastwood via B4 Relay
3 siblings, 0 replies; 6+ messages in thread
From: Joachim Eastwood via B4 Relay @ 2026-11-18 21:45 UTC (permalink / raw)
To: Sandy Huang, Heiko Stübner, Andy Yan, Andrzej Hajda,
Neil Armstrong, Robert Foss, Laurent Pinchart, Jonas Karlman,
Jernej Skrabec, Luca Ceresoli, Maarten Lankhorst, Maxime Ripard,
Thomas Zimmermann, David Airlie, Simona Vetter, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Alexey Charkov,
Cristian Ciocaltea, Nicolas Frattaroli
Cc: dri-devel, linux-rockchip, devicetree, linux-arm-kernel,
Joachim Eastwood
From: Joachim Eastwood <joachim.eastwood@gmail.com>
On-chip DDC controller is unreliable on this board so override DDC on
the HDMI connector with i2c-gpio. The root cause of breakage is not
known but on-chip DDC controller refuses to read the EDID.
Signed-off-by: Joachim Eastwood <joachim.eastwood@gmail.com>
---
.../arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts b/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts
index 3811f9a73bb6c..da6282c105255 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts
@@ -37,6 +37,7 @@ chosen {
hdmi0-con {
compatible = "hdmi-connector";
+ ddc-i2c-bus = <&i2c_gpio_ddc>;
type = "a";
port {
@@ -46,6 +47,16 @@ hdmi0_con_in: endpoint {
};
};
+ /* on-chip DDC controller is unreliable on this board */
+ i2c_gpio_ddc: i2c-ddc {
+ compatible = "i2c-gpio";
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c_ddc_scl &i2c_ddc_sda>;
+ scl-gpios = <&gpio4 RK_PB7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ sda-gpios = <&gpio4 RK_PC0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ i2c-gpio,delay-us = <5>;
+ };
+
ir-receiver {
compatible = "gpio-ir-receiver";
gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_LOW>;
@@ -211,8 +222,7 @@ &gpu {
&hdmi0 {
frl-enable-gpios = <&gpio4 RK_PB1 GPIO_ACTIVE_LOW>;
- pinctrl-0 = <&hdmim0_tx0_cec &hdmim0_tx0_hpd
- &hdmim0_tx0_scl &hdmim0_tx0_sda &hdmi0_tx_on_h>;
+ pinctrl-0 = <&hdmim0_tx0_cec &hdmim0_tx0_hpd &hdmi0_tx_on_h>;
pinctrl-names = "default";
status = "okay";
};
@@ -347,6 +357,14 @@ hdmi {
hdmi0_tx_on_h: hdmi0-tx-on-h {
rockchip,pins = <4 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
};
+
+ i2c_ddc_scl: i2c-ddc-scl {
+ rockchip,pins = <4 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ i2c_ddc_sda: i2c-ddc-sda {
+ rockchip,pins = <4 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
};
hym8563 {
--
2.56.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] arm64: dts: rockchip: enable hdmi sound on rk3588-h96-max-v58
2026-11-18 21:45 [PATCH 0/4] drm/bridge: dw-hdmi-qp: Fix HDMI output on H96 MAX V58 board Joachim Eastwood via B4 Relay
` (2 preceding siblings ...)
2026-11-18 21:45 ` [PATCH 3/4] arm64: dts: rockchip: use i2c-gpio for hdmi ddc on rk3588-h96-max-v58 Joachim Eastwood via B4 Relay
@ 2026-11-18 21:45 ` Joachim Eastwood via B4 Relay
3 siblings, 0 replies; 6+ messages in thread
From: Joachim Eastwood via B4 Relay @ 2026-11-18 21:45 UTC (permalink / raw)
To: Sandy Huang, Heiko Stübner, Andy Yan, Andrzej Hajda,
Neil Armstrong, Robert Foss, Laurent Pinchart, Jonas Karlman,
Jernej Skrabec, Luca Ceresoli, Maarten Lankhorst, Maxime Ripard,
Thomas Zimmermann, David Airlie, Simona Vetter, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Alexey Charkov,
Cristian Ciocaltea, Nicolas Frattaroli
Cc: dri-devel, linux-rockchip, devicetree, linux-arm-kernel,
Joachim Eastwood
From: Joachim Eastwood <joachim.eastwood@gmail.com>
Enable hdmi0_sound and i2s5_8ch to get sound over HDMI.
Signed-off-by: Joachim Eastwood <joachim.eastwood@gmail.com>
---
arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts b/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts
index da6282c105255..5dd3f71932ec1 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts
@@ -239,6 +239,10 @@ hdmi0_out_con: endpoint {
};
};
+&hdmi0_sound {
+ status = "okay";
+};
+
&hdptxphy0 {
status = "okay";
};
@@ -299,6 +303,10 @@ hym8563: rtc@51 {
};
};
+&i2s5_8ch {
+ status = "okay";
+};
+
&gmac1 {
clock_in_out = "output";
phy-handle = <&rgmii_phy1>;
--
2.56.0
^ permalink raw reply related [flat|nested] 6+ messages in thread