drm/bridge: write full Audio InfoFrame

Instead of writing the first byte of the infoframe (and hoping that the
rest is default / zeroes), hook Audio InfoFrame support into the
write_infoframe / clear_infoframes callbacks and use
drm_atomic_helper_connector_hdmi_update_audio_infoframe() to write the
frame.

Acked-by: Maxime Ripard <mripard@kernel.org>
Link: https://lore.kernel.org/r/20250903-adv7511-audio-infoframe-v1-2-05b24459b9a4@oss.qualcomm.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c b/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
index 766b1c96bc887d228492cd7ab0d61094590fa876..87e7e820810a886af8e899410c51e729200f3222 100644 (file)
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
@@ -12,6 +12,8 @@
 #include <sound/soc.h>
 #include <linux/of_graph.h>
 
+#include <drm/display/drm_hdmi_state_helper.h>
+
 #include "adv7511.h"
 
 static void adv7511_calc_cts_n(unsigned int f_tmds, unsigned int fs,
@@ -155,17 +157,8 @@ int adv7511_hdmi_audio_prepare(struct drm_bridge *bridge,
        regmap_update_bits(adv7511->regmap, ADV7511_REG_I2C_FREQ_ID_CFG,
                           ADV7511_I2C_FREQ_ID_CFG_RATE_MASK, rate << 4);
 
-       /* send current Audio infoframe values while updating */
-       regmap_update_bits(adv7511->regmap, ADV7511_REG_INFOFRAME_UPDATE,
-                          BIT(5), BIT(5));
-
-       regmap_write(adv7511->regmap, ADV7511_REG_AUDIO_INFOFRAME(0), 0x1);
-
-       /* use Audio infoframe updated info */
-       regmap_update_bits(adv7511->regmap, ADV7511_REG_INFOFRAME_UPDATE,
-                          BIT(5), 0);
-
-       return 0;
+       return drm_atomic_helper_connector_hdmi_update_audio_infoframe(connector,
+                                                                      &hparms->cea);
 }
 
 int adv7511_hdmi_audio_startup(struct drm_bridge *bridge,
@@ -188,15 +181,9 @@ int adv7511_hdmi_audio_startup(struct drm_bridge *bridge,
        /* not copyrighted */
        regmap_update_bits(adv7511->regmap, ADV7511_REG_AUDIO_CFG1,
                                BIT(5), BIT(5));
-       /* enable audio infoframes */
-       regmap_update_bits(adv7511->regmap, ADV7511_REG_PACKET_ENABLE1,
-                               BIT(3), BIT(3));
        /* AV mute disable */
        regmap_update_bits(adv7511->regmap, ADV7511_REG_GC(0),
                                BIT(7) | BIT(6), BIT(7));
-       /* use Audio infoframe updated info */
-       regmap_update_bits(adv7511->regmap, ADV7511_REG_INFOFRAME_UPDATE,
-                               BIT(5), 0);
 
        /* enable SPDIF receiver */
        if (adv7511->audio_source == ADV7511_AUDIO_SOURCE_SPDIF)
@@ -214,4 +201,6 @@ void adv7511_hdmi_audio_shutdown(struct drm_bridge *bridge,
        if (adv7511->audio_source == ADV7511_AUDIO_SOURCE_SPDIF)
                regmap_update_bits(adv7511->regmap, ADV7511_REG_AUDIO_CONFIG,
                                   BIT(7), 0);
+
+       drm_atomic_helper_connector_hdmi_clear_audio_infoframe(connector);
 }

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index 26f8310382d8d1632dda5185b2b0230b59a6063a..b9be8654130758e69ac7ccbc73a82cc25d731a5c 100644 (file)
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -893,6 +893,9 @@ static int adv7511_bridge_hdmi_clear_infoframe(struct drm_bridge *bridge,
        struct adv7511 *adv7511 = bridge_to_adv7511(bridge);
 
        switch (type) {
+       case HDMI_INFOFRAME_TYPE_AUDIO:
+               adv7511_packet_disable(adv7511, ADV7511_PACKET_ENABLE_AUDIO_INFOFRAME);
+               break;
        case HDMI_INFOFRAME_TYPE_AVI:
                adv7511_packet_disable(adv7511, ADV7511_PACKET_ENABLE_AVI_INFOFRAME);
                break;
@@ -917,6 +920,21 @@ static int adv7511_bridge_hdmi_write_infoframe(struct drm_bridge *bridge,
        struct adv7511 *adv7511 = bridge_to_adv7511(bridge);
 
        switch (type) {
+       case HDMI_INFOFRAME_TYPE_AUDIO:
+               /* send current Audio infoframe values while updating */
+               regmap_update_bits(adv7511->regmap, ADV7511_REG_INFOFRAME_UPDATE,
+                                  BIT(5), BIT(5));
+
+               /* The Audio infoframe id is not configurable */
+               regmap_bulk_write(adv7511->regmap, ADV7511_REG_AUDIO_INFOFRAME_VERSION,
+                                 buffer + 1, len - 1);
+
+               /* use Audio infoframe updated info */
+               regmap_update_bits(adv7511->regmap, ADV7511_REG_INFOFRAME_UPDATE,
+                                  BIT(5), 0);
+
+               adv7511_packet_enable(adv7511, ADV7511_PACKET_ENABLE_AUDIO_INFOFRAME);
+               break;
        case HDMI_INFOFRAME_TYPE_AVI:
                /* send current AVI infoframe values while updating */
                regmap_update_bits(adv7511->regmap, ADV7511_REG_INFOFRAME_UPDATE,