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

Commit 51603478 authored by Misael Lopez Cruz's avatar Misael Lopez Cruz Committed by Tomi Valkeinen
Browse files

ASoC: omap-hdmi-audio: Fix invalid combination of DM_INH and CA 



DM_INH = 1 (stereo downmix prohibited) and CA = 0x00 (Channel
Allocation: FR, FL) is an invalid combination according to the
HDMI Compliance Test 7.31 "Audio InfoFrame".

Signed-off-by: default avatarMisael Lopez Cruz <misael.lopez@ti.com>
Signed-off-by: default avatarJyri Sarha <jsarha@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
parent 88359b99

sound/soc/omap/omap-hdmi-audio.c

+5 −1
Original line number Diff line number Diff line
@@ -217,7 +217,11 @@ static int hdmi_dai_hw_params(struct snd_pcm_substream *substream, 
	else

		cea->db4_ca = 0x13;



	if (cea->db4_ca == 0x00)

		cea->db5_dminh_lsv = CEA861_AUDIO_INFOFRAME_DB5_DM_INH_PERMITTED;

	else

		cea->db5_dminh_lsv = CEA861_AUDIO_INFOFRAME_DB5_DM_INH_PROHIBITED;



	/* the expression is trivial but makes clear what we are doing */

	cea->db5_dminh_lsv |= (0 & CEA861_AUDIO_INFOFRAME_DB5_LSV);