]> git.baikalelectronics.ru Git - kernel.git/commit
ALSA: hda - hdmi: Fix channel map switch not taking effect
authorAnssi Hannula <anssi.hannula@iki.fi>
Mon, 7 Oct 2013 16:24:52 +0000 (19:24 +0300)
committerTakashi Iwai <tiwai@suse.de>
Tue, 8 Oct 2013 07:27:26 +0000 (09:27 +0200)
commit1626eec9b5c67911cd81ea723f3288a545ef862c
treebc900c4a1265e235fc4220451550bc6588273891
parent3b572924fb26ef9a209f3b84e8c9ed0a289b5001
ALSA: hda - hdmi: Fix channel map switch not taking effect

Currently hdmi_setup_audio_infoframe() reprograms the HDA channel
mapping only when the infoframe is not up-to-date or the non-PCM flag
has changed.

However, when just the channel map has been changed, the infoframe may
still be up-to-date and non-PCM flag may not have changed, so the new
channel map is not actually programmed into the HDA codec.

Notably, this failing case is also always triggered when the device is
already in a prepared state and a new channel map is configured while
changing only the channel positions (for example, plain
"speaker-test -c2 -m FR,FL").

Fix that by always programming the channel map in
hdmi_setup_audio_infoframe(). Tested on Intel HDMI.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_hdmi.c