Skip to contentSkip to conversation

drm/bridge-connector: Fix bridge in drm_connector_hdmi_audio_init()

PATCH RESEND Applied Chaoyi Chen 3 participants 4 messages Jun 20, 2025 – Jun 24, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 drm/bridge-connector: Fix bridge in drm_connector_hdmi_audio_init()

From: Chaoyi Chen <[email protected]>

The bridge used in drm_connector_hdmi_audio_init() does not correctly point to the required audio bridge, which lead to incorrect audio configuration input.

Fixes 231adeda9f67 ("drm/bridge-connector: hook DisplayPort audio support")
---
 drivers/gpu/drm/display/drm_bridge_connector.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/display/drm_bridge_connector.c +5 -2
index 7d2e499ea5de..262e93e07a28 100644
@@ -708,11 +708,14 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm,
 	if (bridge_connector->bridge_hdmi_audio ||
 	    bridge_connector->bridge_dp_audio) {
 		struct device *dev;
+		struct drm_bridge *bridge;
 
 		if (bridge_connector->bridge_hdmi_audio)
-			dev = bridge_connector->bridge_hdmi_audio->hdmi_audio_dev;
+			bridge = bridge_connector->bridge_hdmi_audio;
 		else
-			dev = bridge_connector->bridge_dp_audio->hdmi_audio_dev;
+			bridge = bridge_connector->bridge_dp_audio;
+
+		dev = bridge->hdmi_audio_dev;
 
 		ret = drm_connector_hdmi_audio_init(connector, dev,
 						    &drm_bridge_connector_hdmi_audio_funcs,
Signature · 1 line
2.49.0
Tested-by on v1 1/1
#1 lore raw
Quoted 8 lines · Chaoyi Chen

From: Chaoyi Chen <[email protected]>

The bridge used in drm_connector_hdmi_audio_init() does not correctly point to the required audio bridge, which lead to incorrect audio configuration input.

Fixes 231adeda9f67 ("drm/bridge-connector: hook DisplayPort audio support")

Thanks, this patch fixes the following errors for me on a Qualcomm X1 Elite laptop with v6.16-rc3:

[   10.900256] hdmi-audio-codec hdmi-audio-codec.5.auto: hdmi_codec_probe: Invalid parameters
[   10.901376] hdmi-audio-codec hdmi-audio-codec.4.auto: hdmi_codec_probe: Invalid parameters
[   10.909627] hdmi-audio-codec hdmi-audio-codec.5.auto: probe with driver hdmi-audio-codec failed with error -22
[   10.910813] hdmi-audio-codec hdmi-audio-codec.6.auto: hdmi_codec_probe: Invalid parameters
[   10.918145] hdmi-audio-codec hdmi-audio-codec.4.auto: probe with driver hdmi-audio-codec failed with error -22
[   10.919296] hdmi-audio-codec hdmi-audio-codec.5.auto: hdmi_codec_probe: Invalid parameters
[   10.919298] hdmi-audio-codec hdmi-audio-codec.5.auto: probe with driver hdmi-audio-codec failed with error -22
[   10.928482] hdmi-audio-codec hdmi-audio-codec.6.auto: probe with driver hdmi-audio-codec failed with error -22
[   10.930742] hdmi-audio-codec hdmi-audio-codec.6.auto: hdmi_codec_probe: Invalid parameters
[   10.930744] hdmi-audio-codec hdmi-audio-codec.6.auto: probe with driver hdmi-audio-codec failed with error -22

By de-referencing the "bridge" from the outer scope I think the current broken code basically de-references some random out-of-bounds memory. This should be fixed ASAP.

drivers/gpu/drm/display/drm_bridge_connector.c struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, · line 711

Quoted 13 lines
---
 drivers/gpu/drm/display/drm_bridge_connector.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/display/drm_bridge_connector.c +1 -0
index 7d2e499ea5de..262e93e07a28 100644
@@ -708,11 +708,14 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm,
 	if (bridge_connector->bridge_hdmi_audio ||
 	    bridge_connector->bridge_dp_audio) {
 		struct device *dev;
+		struct drm_bridge *bridge;

This is technically redundant since "bridge" is already defined in the top-level of this function and shadowing it (declaring it again) doesn't really make it less confusing.

I would suggest either dropping this line and re-assigning the existing bridge variable (as it was before commit 231adeda9f67 ("drm/bridge-connector: hook DisplayPort audio support")), or perhaps renaming this to

		struct drm_bridge *audio_bridge;

for less confusion.

drivers/gpu/drm/display/drm_bridge_connector.c struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, · line 718

Quoted 9 lines
drivers/gpu/drm/display/drm_bridge_connector.c +4 -2
 		if (bridge_connector->bridge_hdmi_audio)
-			dev = bridge_connector->bridge_hdmi_audio->hdmi_audio_dev;
+			bridge = bridge_connector->bridge_hdmi_audio;
 		else
-			dev = bridge_connector->bridge_dp_audio->hdmi_audio_dev;
+			bridge = bridge_connector->bridge_dp_audio;
+
+		dev = bridge->hdmi_audio_dev;

The "dev" variable seems pointless now, just inline bridge->hdmi_audio_dev in the call below?

drivers/gpu/drm/display/drm_bridge_connector.c struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, · line 721

Quoted 3 lines
drivers/gpu/drm/display/drm_bridge_connector.c +0 -0
 		ret = drm_connector_hdmi_audio_init(connector, dev,
 						    &drm_bridge_connector_hdmi_audio_funcs,

Thanks,
Stephan

Reviewed-by on v1 1/1
#2 lore raw
In reply to Chaoyi Chen
Quoted 11 lines · Chaoyi Chen

From: Chaoyi Chen <[email protected]>

The bridge used in drm_connector_hdmi_audio_init() does not correctly point to the required audio bridge, which lead to incorrect audio configuration input.

Fixes 231adeda9f67 ("drm/bridge-connector: hook DisplayPort audio support")
---
  drivers/gpu/drm/display/drm_bridge_connector.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
Signature · 2 lines
With best wishes
Dmitry
#3 lore raw
In reply to Chaoyi Chen
Quoted 5 lines · Chaoyi Chen

The bridge used in drm_connector_hdmi_audio_init() does not correctly point to the required audio bridge, which lead to incorrect audio configuration input.

Applied to drm-misc-fixes, thanks!

[1/1] drm/bridge-connector: Fix bridge in drm_connector_hdmi_audio_init()

      commit: 10357824151262636fda879845f8b64553541106

Best regards,

Signature · 2 lines
With best wishes
Dmitry