From: Wang Xingchao Date: Thu, 6 Sep 2012 02:02:38 +0000 (+0800) Subject: ALSA: HDMI - Setup channel mapping for non_pcm audio X-Git-Tag: v3.7-rc1~81^2~45 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2d7e887cbba8272a46c42d228d3ffd9a2de04168;p=~emulex%2Finfiniband.git 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 Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index a6835bd9d9b..5361298be4d 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;