Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53425075 authored by Stefan Ekenberg's avatar Stefan Ekenberg Committed by Greg Kroah-Hartman
Browse files

drm/bridge: adv7511_audio: Update Audio InfoFrame properly 



[ Upstream commit 902806baf3c1e8383c1fe3ff0b6042b8cb5c2707 ]

AUDIO_UPDATE bit (Bit 5 of MAIN register 0x4A) needs to be set to 1
while updating Audio InfoFrame information and then set to 0 when done.
Otherwise partially updated Audio InfoFrames could be sent out. Two
cases where this rule were not followed are fixed:
 - In adv7511_hdmi_hw_params() make sure AUDIO_UPDATE bit is updated
   before/after setting ADV7511_REG_AUDIO_INFOFRAME.
 - In audio_startup() use the correct register for clearing
   AUDIO_UPDATE bit.

The problem with corrupted audio infoframes were discovered by letting
a HDMI logic analyser check the output of ADV7535.

Note that this patchs replaces writing REG_GC(1) with
REG_INFOFRAME_UPDATE. Bit 5 of REG_GC(1) is positioned within field
GC_PP[3:0] and that field doesn't control audio infoframe and is read-
only. My conclusion therefore was that the author if this code meant to
clear bit 5 of REG_INFOFRAME_UPDATE from the very beginning.

Tested-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Fixes: 53c515be ("drm/bridge: adv7511: Add Audio support")
Signed-off-by: default avatarStefan Ekenberg <stefan.ekenberg@axis.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20241119-adv7511-audio-info-frame-v4-1-4ae68e76c89c@axis.com


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6ffd9a34

drivers/gpu/drm/bridge/adv7511/adv7511_audio.c

+12 −2
Original line number Diff line number Diff line
@@ -147,7 +147,16 @@ int adv7511_hdmi_hw_params(struct device *dev, void *data, 
			   ADV7511_AUDIO_CFG3_LEN_MASK, len);

	regmap_update_bits(adv7511->regmap, ADV7511_REG_I2C_FREQ_ID_CFG,

			   ADV7511_I2C_FREQ_ID_CFG_RATE_MASK, rate << 4);

	regmap_write(adv7511->regmap, 0x73, 0x1);



	/* 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;

}
@@ -178,8 +187,9 @@ static int audio_startup(struct device *dev, void *data) 
	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_GC(1),

	regmap_update_bits(adv7511->regmap, ADV7511_REG_INFOFRAME_UPDATE,

				BIT(5), 0);



	/* enable SPDIF receiver */

	if (adv7511->audio_source == ADV7511_AUDIO_SOURCE_SPDIF)

		regmap_update_bits(adv7511->regmap, ADV7511_REG_AUDIO_CONFIG,