diff options
| author | Anssi Hannula <anssi.hannula@iki.fi> | 2013-10-05 02:25:44 +0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-03-12 13:25:27 +0100 |
| commit | 822d77896bafc1f9dd06f42ad6200a08930f3155 (patch) | |
| tree | 27cb35adc9bd75e53cf4808dc969e31ec2534d46 /sound | |
| parent | 082a24d32f77db8aa160382827ee37de0ddfd896 (diff) | |
| download | lwn-822d77896bafc1f9dd06f42ad6200a08930f3155.tar.gz lwn-822d77896bafc1f9dd06f42ad6200a08930f3155.zip | |
ALSA: hda - hdmi: Tweak debug messages to be more useful
commit 980b24958f0c615fd003d37f0fce4ab1ecd01784 upstream.
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 2f4e668c661a..37da6fb999f2 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -650,8 +650,6 @@ static void hdmi_std_setup_channel_mapping(struct hda_codec *codec, break; } } - - hdmi_debug_channel_mapping(codec, pin_nid); } struct channel_map_table { @@ -806,6 +804,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); } /* @@ -1004,9 +1004,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_stop_infoframe_trans(codec, pin_nid); hdmi_fill_audio_infoframe(codec, pin_nid, ai.bytes, sizeof(ai)); |