summary refs log tree commit diff
path: root/sound
diff options
context:
space:
mode:
authorWu Fengguang <fengguang.wu@intel.com>2010-03-08 10:45:38 +0800
committerTakashi Iwai <tiwai@suse.de>2010-03-08 08:21:25 +0100
commit2abbf4391fb56dfa97221ed6796782537d15196f (patch)
treec989facc03c48b6a45bfabeeb4537680dfb21e64 /sound
parent079d88ccc374d2c1a850b8a83595ba4c907fb3df (diff)
downloadlinux-2abbf4391fb56dfa97221ed6796782537d15196f.tar.gz
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_hdmi.c12
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,
 	}
 
 	snd_print_channel_allocation(eld->spk_alloc, buf, sizeof(buf));
-	snd_printdd(KERN_INFO
-			"HDMI: select CA 0x%x for %d-channel allocation: %s\n",
-			ai->CA, channels, buf);
+	snd_printdd("HDMI: select CA 0x%x for %d-channel allocation: %s\n",
+		    ai->CA, channels, buf);
 
 	return ai->CA;
 }
@@ -442,7 +441,8 @@ static void hdmi_setup_channel_mapping(struct hda_codec *codec,
 					  AC_VERB_SET_HDMI_CHAN_SLOT,
 					  hdmi_channel_mapping[ca][i]);
 		if (err) {
-			snd_printdd(KERN_INFO "HDMI: channel mapping failed\n");
+			snd_printdd(KERN_NOTICE
+				    "HDMI: channel mapping failed\n");
 			break;
 		}
 	}
@@ -599,6 +599,10 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, hda_nid_t nid,
 
 		pin_nid = spec->pin[i];
 		if (!hdmi_infoframe_uptodate(codec, pin_nid, &ai)) {
+			snd_printdd("hdmi_setup_audio_infoframe: "
+				    "cvt=%d pin=%d channels=%d\n",
+				    nid, pin_nid,
+				    substream->runtime->channels);
 			hdmi_setup_channel_mapping(codec, pin_nid, &ai);
 			hdmi_stop_infoframe_trans(codec, pin_nid);
 			hdmi_fill_audio_infoframe(codec, pin_nid, &ai);