diff options
| author | Wu Fengguang <fengguang.wu@intel.com> | 2010-03-07 21:45:38 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-08 02:21:25 -0500 |
| commit | 2abbf4391fb56dfa97221ed6796782537d15196f (patch) | |
| tree | c989facc03c48b6a45bfabeeb4537680dfb21e64 | |
| parent | 079d88ccc374d2c1a850b8a83595ba4c907fb3df (diff) | |
ALSA: hdmi - show debug message on changing audio infoframe
Also change printk level for the two others.
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index b2ab39670dda..2c2bafbf0258 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c | |||
| @@ -398,9 +398,8 @@ static int hdmi_setup_channel_allocation(struct hda_codec *codec, hda_nid_t nid, | |||
| 398 | } | 398 | } |
| 399 | 399 | ||
| 400 | snd_print_channel_allocation(eld->spk_alloc, buf, sizeof(buf)); | 400 | snd_print_channel_allocation(eld->spk_alloc, buf, sizeof(buf)); |
| 401 | snd_printdd(KERN_INFO | 401 | snd_printdd("HDMI: select CA 0x%x for %d-channel allocation: %s\n", |
| 402 | "HDMI: select CA 0x%x for %d-channel allocation: %s\n", | 402 | ai->CA, channels, buf); |
| 403 | ai->CA, channels, buf); | ||
| 404 | 403 | ||
| 405 | return ai->CA; | 404 | return ai->CA; |
| 406 | } | 405 | } |
| @@ -442,7 +441,8 @@ static void hdmi_setup_channel_mapping(struct hda_codec *codec, | |||
| 442 | AC_VERB_SET_HDMI_CHAN_SLOT, | 441 | AC_VERB_SET_HDMI_CHAN_SLOT, |
| 443 | hdmi_channel_mapping[ca][i]); | 442 | hdmi_channel_mapping[ca][i]); |
| 444 | if (err) { | 443 | if (err) { |
| 445 | snd_printdd(KERN_INFO "HDMI: channel mapping failed\n"); | 444 | snd_printdd(KERN_NOTICE |
| 445 | "HDMI: channel mapping failed\n"); | ||
| 446 | break; | 446 | break; |
| 447 | } | 447 | } |
| 448 | } | 448 | } |
| @@ -599,6 +599,10 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, hda_nid_t nid, | |||
| 599 | 599 | ||
| 600 | pin_nid = spec->pin[i]; | 600 | pin_nid = spec->pin[i]; |
| 601 | if (!hdmi_infoframe_uptodate(codec, pin_nid, &ai)) { | 601 | if (!hdmi_infoframe_uptodate(codec, pin_nid, &ai)) { |
| 602 | snd_printdd("hdmi_setup_audio_infoframe: " | ||
| 603 | "cvt=%d pin=%d channels=%d\n", | ||
| 604 | nid, pin_nid, | ||
| 605 | substream->runtime->channels); | ||
| 602 | hdmi_setup_channel_mapping(codec, pin_nid, &ai); | 606 | hdmi_setup_channel_mapping(codec, pin_nid, &ai); |
| 603 | hdmi_stop_infoframe_trans(codec, pin_nid); | 607 | hdmi_stop_infoframe_trans(codec, pin_nid); |
| 604 | hdmi_fill_audio_infoframe(codec, pin_nid, &ai); | 608 | hdmi_fill_audio_infoframe(codec, pin_nid, &ai); |
