diff options
| author | Misael Lopez Cruz <misael.lopez@ti.com> | 2015-04-22 16:23:01 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-06-03 14:34:14 +0300 |
| commit | 516034787e06834816e9a0435499690704f01c47 (patch) | |
| tree | 90b43ebb736ceddccdd96e47201e312c93e80267 /sound | |
| parent | 88359b99d0841d0def5dffff911875dfc78a94fa (diff) | |
| download | linux-516034787e06834816e9a0435499690704f01c47.tar.gz linux-516034787e06834816e9a0435499690704f01c47.tar.bz2 linux-516034787e06834816e9a0435499690704f01c47.zip | |
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: Misael Lopez Cruz <misael.lopez@ti.com>
Signed-off-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/omap/omap-hdmi-audio.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-hdmi-audio.c b/sound/soc/omap/omap-hdmi-audio.c index 8df303f64e11..aeef25c0cb3d 100644 --- a/sound/soc/omap/omap-hdmi-audio.c +++ b/sound/soc/omap/omap-hdmi-audio.c @@ -217,7 +217,11 @@ static int hdmi_dai_hw_params(struct snd_pcm_substream *substream, else cea->db4_ca = 0x13; - cea->db5_dminh_lsv = CEA861_AUDIO_INFOFRAME_DB5_DM_INH_PROHIBITED; + 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); |