Commit 10357824 authored by Chaoyi Chen's avatar Chaoyi Chen Committed by Dmitry Baryshkov
Browse files

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: 231adeda ("drm/bridge-connector: hook DisplayPort audio support")
Signed-off-by: default avatarChaoyi Chen <chaoyi.chen@rock-chips.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Tested-by: default avatarStephan Gerhold <stephan.gerhold@linaro.org>
Link: https://lore.kernel.org/r/20250620011616.118-1-kernel@airkyi.com


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
parent fb721b2c

drivers/gpu/drm/display/drm_bridge_connector.c

+5 −2
Original line number Diff line number Diff line
@@ -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,