]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/display: hdmi_state_helper: reject Audio IF updates if it's not supported
authorDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Wed, 7 Jan 2026 18:15:04 +0000 (20:15 +0200)
committerDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Mon, 19 Jan 2026 11:11:47 +0000 (13:11 +0200)
Updating the InfoFrame if it can not be sent over the wire makes no
sense. Change drm_atomic_helper_connector_hdmi_update_audio_infoframe()
and drm_atomic_helper_connector_hdmi_clear_audio_infoframe() to return
an error if Audio InfoFrame callbacks are not implemented.

Acked-by: Maxime Ripard <mripard@kernel.org>
Link: https://patch.msgid.link/20260107-limit-infoframes-2-v4-7-213d0d3bd490@oss.qualcomm.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
drivers/gpu/drm/display/drm_hdmi_state_helper.c

index 5a3817271d91dfca22fbc9714f9c6947839b2552..e8556bf9e1da6876e3318b4cde231f1f4551883e 100644 (file)
@@ -1061,7 +1061,7 @@ drm_atomic_helper_connector_hdmi_update_audio_infoframe(struct drm_connector *co
        if (!info->is_hdmi)
                return 0;
 
-       if (!funcs) {
+       if (!funcs || !funcs->audio.write_infoframe) {
                drm_dbg_kms(connector->dev, "Function not implemented, bailing.\n");
                return -EINVAL;
        }
@@ -1102,7 +1102,7 @@ drm_atomic_helper_connector_hdmi_clear_audio_infoframe(struct drm_connector *con
        if (!info->is_hdmi)
                return 0;
 
-       if (!funcs) {
+       if (!funcs || !funcs->audio.write_infoframe) {
                drm_dbg_kms(connector->dev, "Function not implemented, bailing.\n");
                return -EINVAL;
        }