Skip to content

Commit 1035782

Browse files
windowsairlumag
authored andcommitted
drm/bridge-connector: Fix bridge in drm_connector_hdmi_audio_init()
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: 231aded ("drm/bridge-connector: hook DisplayPort audio support") Signed-off-by: Chaoyi Chen <[email protected]> Reviewed-by: Dmitry Baryshkov <[email protected]> Tested-by: Stephan Gerhold <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dmitry Baryshkov <[email protected]>
1 parent fb721b2 commit 1035782

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

drivers/gpu/drm/display/drm_bridge_connector.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -708,11 +708,14 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm,
708708
if (bridge_connector->bridge_hdmi_audio ||
709709
bridge_connector->bridge_dp_audio) {
710710
struct device *dev;
711+
struct drm_bridge *bridge;
711712

712713
if (bridge_connector->bridge_hdmi_audio)
713-
dev = bridge_connector->bridge_hdmi_audio->hdmi_audio_dev;
714+
bridge = bridge_connector->bridge_hdmi_audio;
714715
else
715-
dev = bridge_connector->bridge_dp_audio->hdmi_audio_dev;
716+
bridge = bridge_connector->bridge_dp_audio;
717+
718+
dev = bridge->hdmi_audio_dev;
716719

717720
ret = drm_connector_hdmi_audio_init(connector, dev,
718721
&drm_bridge_connector_hdmi_audio_funcs,

0 commit comments

Comments
 (0)