Skip to content

Commit 474d540

Browse files
committed
drm/display: bridge_connector: move audio_infoframe checks to OP_HDMI
There are DRM_BRIDGE_OP_HDMI_AUDIO bridges (e.g. Lontium LT9611UXC) which don't implement DRM_BRIDGE_OP_HDMI and don't implement hdmi_clear_audio_infoframe / hdmi_write_audio_infoframe callbacks. Move corresponding checks under the DRM_BRIDGE_OP_HDMI condition, making sure that we require those callbacks only from the bridges which are actually going to use them. Fixes: b626b1a ("drm/bridge: refactor HDMI InfoFrame callbacks") Acked-by: Maxime Ripard <mripard@kernel.org> Link: https://patch.msgid.link/20260126-drm-fix-lt9611uxc-v1-1-04a635a8f5cf@oss.qualcomm.com Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
1 parent b2c6627 commit 474d540

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

drivers/gpu/drm/display/drm_bridge_connector.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -851,6 +851,11 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm,
851851
!bridge->funcs->hdmi_clear_hdmi_infoframe)
852852
return ERR_PTR(-EINVAL);
853853

854+
if (bridge->ops & DRM_BRIDGE_OP_HDMI_AUDIO &&
855+
(!bridge->funcs->hdmi_write_audio_infoframe ||
856+
!bridge->funcs->hdmi_clear_audio_infoframe))
857+
return ERR_PTR(-EINVAL);
858+
854859
if (bridge->ops & DRM_BRIDGE_OP_HDMI_HDR_DRM_INFOFRAME &&
855860
(!bridge->funcs->hdmi_write_hdr_drm_infoframe ||
856861
!bridge->funcs->hdmi_clear_hdr_drm_infoframe))
@@ -880,9 +885,7 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm,
880885
!bridge->hdmi_audio_spdif_playback)
881886
return ERR_PTR(-EINVAL);
882887

883-
if (!bridge->funcs->hdmi_write_audio_infoframe ||
884-
!bridge->funcs->hdmi_clear_audio_infoframe ||
885-
!bridge->funcs->hdmi_audio_prepare ||
888+
if (!bridge->funcs->hdmi_audio_prepare ||
886889
!bridge->funcs->hdmi_audio_shutdown)
887890
return ERR_PTR(-EINVAL);
888891

0 commit comments

Comments
 (0)