summaryrefslogtreecommitdiff
path: root/sound/pci
diff options
context:
space:
mode:
authorAnssi Hannula <anssi.hannula@iki.fi>2013-10-04 23:25:44 (GMT)
committerTakashi Iwai <tiwai@suse.de>2013-10-07 10:49:25 (GMT)
commit980b24958f0c615fd003d37f0fce4ab1ecd01784 (patch)
treeeb8f9e89f7a50dadb1db87a7d2d6768c14f8b0b1 /sound/pci
parentbb731f2100e614a8d7c5965d3663aed893859733 (diff)
downloadlinux-fsl-qoriq-980b24958f0c615fd003d37f0fce4ab1ecd01784.tar.xz
ALSA: hda - hdmi: Tweak debug messages to be more useful
Allow channel map debugging for both automatic and manual channel maps, and print CA always when updating infoframe. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_hdmi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 62b1e85..00e0413 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -637,8 +637,6 @@ static void hdmi_std_setup_channel_mapping(struct hda_codec *codec,
break;
}
}
-
- hdmi_debug_channel_mapping(codec, pin_nid);
}
struct channel_map_table {
@@ -793,6 +791,8 @@ static void hdmi_setup_channel_mapping(struct hda_codec *codec,
hdmi_std_setup_channel_mapping(codec, pin_nid, non_pcm, ca);
hdmi_setup_fake_chmap(map, ca);
}
+
+ hdmi_debug_channel_mapping(codec, pin_nid);
}
/*
@@ -983,9 +983,9 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec,
if (!hdmi_infoframe_uptodate(codec, pin_nid, ai.bytes,
sizeof(ai))) {
snd_printdd("hdmi_setup_audio_infoframe: "
- "pin=%d channels=%d\n",
+ "pin=%d channels=%d ca=0x%02x\n",
pin_nid,
- active_channels);
+ active_channels, ca);
hdmi_setup_channel_mapping(codec, pin_nid, non_pcm, ca,
channels, per_pin->chmap,
per_pin->chmap_set);