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 <xingchao.wang@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Wang Xingchao 2012-09-06 10:02:38 +08:00 committed by Takashi Iwai
parent 433968da4d
commit 2d7e887cbb

View file

@ -780,6 +780,11 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, int pin_idx,
hdmi_fill_audio_infoframe(codec, pin_nid, hdmi_fill_audio_infoframe(codec, pin_nid,
ai.bytes, sizeof(ai)); ai.bytes, sizeof(ai));
hdmi_start_infoframe_trans(codec, pin_nid); 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; per_cvt->non_pcm = non_pcm;