ALSA: hda - make HDMI messages more user friendly
- make some messages more user friendly
- add message prefix "HDMI:" to indicate the problem's domain
(also easier to do `dmesg | grep HDMI` ;-)
Signed-off-by: Wu Fengguang <wfg@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
diff --git a/sound/pci/hda/patch_intelhdmi.c b/sound/pci/hda/patch_intelhdmi.c
index 4a48011..fe08bef 100644
--- a/sound/pci/hda/patch_intelhdmi.c
+++ b/sound/pci/hda/patch_intelhdmi.c
@@ -286,7 +286,7 @@
AC_VERB_SET_CVT_CHAN_COUNT, chs - 1);
if (chs != hdmi_get_channel_count(codec))
- snd_printd(KERN_INFO "Channel count expect=%d, real=%d\n",
+ snd_printd(KERN_INFO "HDMI channel count: expect %d, get %d\n",
chs, hdmi_get_channel_count(codec));
}
@@ -299,7 +299,7 @@
for (i = 0; i < 8; i++) {
slot = snd_hda_codec_read(codec, CVT_NID, 0,
AC_VERB_GET_HDMI_CHAN_SLOT, i);
- printk(KERN_DEBUG "ASP channel %d => slot %d\n",
+ printk(KERN_DEBUG "HDMI: ASP channel %d => slot %d\n",
slot >> 4, slot & 0x7);
}
#endif
@@ -326,12 +326,12 @@
int size;
size = snd_hdmi_get_eld_size(codec, PIN_NID);
- printk(KERN_DEBUG "ELD buf size is %d\n", size);
+ printk(KERN_DEBUG "HDMI: ELD buf size is %d\n", size);
for (i = 0; i < 8; i++) {
size = snd_hda_codec_read(codec, PIN_NID, 0,
AC_VERB_GET_HDMI_DIP_SIZE, i);
- printk(KERN_DEBUG "DIP GP[%d] buf size is %d\n", i, size);
+ printk(KERN_DEBUG "HDMI: DIP GP[%d] buf size is %d\n", i, size);
}
#endif
}
@@ -359,8 +359,8 @@
break;
}
snd_printd(KERN_INFO
- "DIP GP[%d] buf reported size=%d, written=%d\n",
- i, size, j);
+ "HDMI: DIP GP[%d] buf reported size=%d, written=%d\n",
+ i, size, j);
}
#endif
}
@@ -498,7 +498,9 @@
int pind = !!(res & AC_UNSOL_RES_PD);
int eldv = !!(res & AC_UNSOL_RES_ELDV);
- printk(KERN_INFO "HDMI intrinsic event: PD=%d ELDV=%d\n", pind, eldv);
+ printk(KERN_INFO
+ "HDMI hot plug event: Presence_Detect=%d ELD_Valid=%d\n",
+ pind, eldv);
if (pind && eldv) {
hdmi_parse_eld(codec);
@@ -512,13 +514,13 @@
int cp_state = !!(res & AC_UNSOL_RES_CP_STATE);
int cp_ready = !!(res & AC_UNSOL_RES_CP_READY);
- printk(KERN_INFO "HDMI non-intrinsic event: "
- "SUBTAG=0x%x CP_STATE=%d CP_READY=%d\n",
- subtag,
- cp_state,
- cp_ready);
+ printk(KERN_INFO
+ "HDMI content protection event: SUBTAG=0x%x CP_STATE=%d CP_READY=%d\n",
+ subtag,
+ cp_state,
+ cp_ready);
- /* who cares? */
+ /* TODO */
if (cp_state)
;
if (cp_ready)
@@ -532,9 +534,7 @@
int subtag = (res & AC_UNSOL_RES_SUBTAG) >> AC_UNSOL_RES_SUBTAG_SHIFT;
if (tag != INTEL_HDMI_EVENT_TAG) {
- snd_printd(KERN_INFO
- "Unexpected HDMI unsolicited event tag 0x%x\n",
- tag);
+ snd_printd(KERN_INFO "Unexpected HDMI event tag 0x%x\n", tag);
return;
}