mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
53 lines
1.5 KiB
Diff
53 lines
1.5 KiB
Diff
|
From a319c6c1a5661af2014b98cd0a02526e7f2f515a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Matthias Reichl <hias@horus.com>
|
||
|
|
Date: Sat, 9 Sep 2023 13:46:33 +0200
|
||
|
|
Subject: [PATCH 0843/1016] ASoC: hdmi-codec: Fix broken channel map reporting
|
||
|
|
|
||
|
|
Commit 4e0871333661 ("ASoC: hdmi-codec: fix channel info for
|
||
|
|
compressed formats") accidentally changed hcp->chmap_idx from
|
||
|
|
ca_id, the CEA channel allocation ID, to idx, the index to
|
||
|
|
the table of channel mappings ordered by preference.
|
||
|
|
|
||
|
|
This resulted in wrong channel maps being reported to userspace,
|
||
|
|
eg for 5.1 "FL,FR,LFE,FC" was reported instead of the expected
|
||
|
|
"FL,FR,LFE,FC,RL,RR":
|
||
|
|
|
||
|
|
~ # speaker-test -c 6 -t sine
|
||
|
|
...
|
||
|
|
0 - Front Left
|
||
|
|
3 - Front Center
|
||
|
|
1 - Front Right
|
||
|
|
2 - LFE
|
||
|
|
4 - Unknown
|
||
|
|
5 - Unknown
|
||
|
|
|
||
|
|
~ # amixer cget iface=PCM,name='Playback Channel Map' | grep ': values'
|
||
|
|
: values=3,4,8,7,0,0,0,0
|
||
|
|
|
||
|
|
Revert this incorrect change so that channel maps are properly
|
||
|
|
reported again.
|
||
|
|
|
||
|
|
Fixes: 4e0871333661 ("ASoC: hdmi-codec: fix channel info for compressed formats")
|
||
|
|
Cc: stable@vger.kernel.org
|
||
|
|
Signed-off-by: Matthias Reichl <hias@horus.com>
|
||
|
|
---
|
||
|
|
sound/soc/codecs/hdmi-codec.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c
|
||
|
|
index a192d985c5f1..94dddaeeb3ea 100644
|
||
|
|
--- a/sound/soc/codecs/hdmi-codec.c
|
||
|
|
+++ b/sound/soc/codecs/hdmi-codec.c
|
||
|
|
@@ -520,7 +520,7 @@ static int hdmi_codec_fill_codec_params(struct snd_soc_dai *dai,
|
||
|
|
hp->sample_rate = sample_rate;
|
||
|
|
hp->channels = channels;
|
||
|
|
|
||
|
|
- hcp->chmap_idx = idx;
|
||
|
|
+ hcp->chmap_idx = ca_id;
|
||
|
|
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.42.0
|
||
|
|
|