From 9b596cb4045fc63837ac1c612108991bc00525fb Mon Sep 17 00:00:00 2001 From: Wang Xingchao Date: Wed, 5 Sep 2012 11:11:24 +0800 Subject: [PATCH RFC 3/3] ALSA: HDMI - Setup channel mapping for non_pcm audio For HBR stream test, use straight channel mapping way. when switched back to "speaker-test -c8", even the audio infoframe is up-to-date, there should be correct channel mapping setup. Signed-off-by: Wang Xingchao --- sound/pci/hda/patch_hdmi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index a87f8b2..bcb0939 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -780,6 +780,11 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, int pin_idx, hdmi_fill_audio_infoframe(codec, pin_nid, ai.bytes, sizeof(ai)); hdmi_start_infoframe_trans(codec, pin_nid); + } else { + /* For non-pcm audio switch, setup new channel mapping + * accordingly */ + if (per_cvt->non_pcm != non_pcm) + hdmi_setup_channel_mapping(codec, pin_nid, cvt_nid, non_pcm, ca); } per_cvt->non_pcm = non_pcm; -- 1.7.9.5