aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_intelhdmi.c
diff options
context:
space:
mode:
authorWu Fengguang <wfg@linux.intel.com>2008-11-21 20:40:53 -0500
committerTakashi Iwai <tiwai@suse.de>2008-11-22 05:14:48 -0500
commit03284c8f23440479de79e8cbf368085ea872884e (patch)
treea81466daa2babe9a6d9981612240a50bd6a2c4ae /sound/pci/hda/patch_intelhdmi.c
parentcc02b83c904592ce8714787094256a9bf8e24b6f (diff)
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>
Diffstat (limited to 'sound/pci/hda/patch_intelhdmi.c')
-rw-r--r--sound/pci/hda/patch_intelhdmi.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/sound/pci/hda/patch_intelhdmi.c b/sound/pci/hda/patch_intelhdmi.c
index 4a48011ae35b..fe08bef897cd 100644
--- a/sound/pci/hda/patch_intelhdmi.c
+++ b/sound/pci/hda/patch_intelhdmi.c
@@ -286,7 +286,7 @@ static void hdmi_set_channel_count(struct hda_codec *codec, int chs)
286 AC_VERB_SET_CVT_CHAN_COUNT, chs - 1); 286 AC_VERB_SET_CVT_CHAN_COUNT, chs - 1);
287 287
288 if (chs != hdmi_get_channel_count(codec)) 288 if (chs != hdmi_get_channel_count(codec))
289 snd_printd(KERN_INFO "Channel count expect=%d, real=%d\n", 289 snd_printd(KERN_INFO "HDMI channel count: expect %d, get %d\n",
290 chs, hdmi_get_channel_count(codec)); 290 chs, hdmi_get_channel_count(codec));
291} 291}
292 292
@@ -299,7 +299,7 @@ static void hdmi_debug_channel_mapping(struct hda_codec *codec)
299 for (i = 0; i < 8; i++) { 299 for (i = 0; i < 8; i++) {
300 slot = snd_hda_codec_read(codec, CVT_NID, 0, 300 slot = snd_hda_codec_read(codec, CVT_NID, 0,
301 AC_VERB_GET_HDMI_CHAN_SLOT, i); 301 AC_VERB_GET_HDMI_CHAN_SLOT, i);
302 printk(KERN_DEBUG "ASP channel %d => slot %d\n", 302 printk(KERN_DEBUG "HDMI: ASP channel %d => slot %d\n",
303 slot >> 4, slot & 0x7); 303 slot >> 4, slot & 0x7);
304 } 304 }
305#endif 305#endif
@@ -326,12 +326,12 @@ static void hdmi_debug_dip_size(struct hda_codec *codec)
326 int size; 326 int size;
327 327
328 size = snd_hdmi_get_eld_size(codec, PIN_NID); 328 size = snd_hdmi_get_eld_size(codec, PIN_NID);
329 printk(KERN_DEBUG "ELD buf size is %d\n", size); 329 printk(KERN_DEBUG "HDMI: ELD buf size is %d\n", size);
330 330
331 for (i = 0; i < 8; i++) { 331 for (i = 0; i < 8; i++) {
332 size = snd_hda_codec_read(codec, PIN_NID, 0, 332 size = snd_hda_codec_read(codec, PIN_NID, 0,
333 AC_VERB_GET_HDMI_DIP_SIZE, i); 333 AC_VERB_GET_HDMI_DIP_SIZE, i);
334 printk(KERN_DEBUG "DIP GP[%d] buf size is %d\n", i, size); 334 printk(KERN_DEBUG "HDMI: DIP GP[%d] buf size is %d\n", i, size);
335 } 335 }
336#endif 336#endif
337} 337}
@@ -359,8 +359,8 @@ static void hdmi_clear_dip_buffers(struct hda_codec *codec)
359 break; 359 break;
360 } 360 }
361 snd_printd(KERN_INFO 361 snd_printd(KERN_INFO
362 "DIP GP[%d] buf reported size=%d, written=%d\n", 362 "HDMI: DIP GP[%d] buf reported size=%d, written=%d\n",
363 i, size, j); 363 i, size, j);
364 } 364 }
365#endif 365#endif
366} 366}
@@ -498,7 +498,9 @@ static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)
498 int pind = !!(res & AC_UNSOL_RES_PD); 498 int pind = !!(res & AC_UNSOL_RES_PD);
499 int eldv = !!(res & AC_UNSOL_RES_ELDV); 499 int eldv = !!(res & AC_UNSOL_RES_ELDV);
500 500
501 printk(KERN_INFO "HDMI intrinsic event: PD=%d ELDV=%d\n", pind, eldv); 501 printk(KERN_INFO
502 "HDMI hot plug event: Presence_Detect=%d ELD_Valid=%d\n",
503 pind, eldv);
502 504
503 if (pind && eldv) { 505 if (pind && eldv) {
504 hdmi_parse_eld(codec); 506 hdmi_parse_eld(codec);
@@ -512,13 +514,13 @@ static void hdmi_non_intrinsic_event(struct hda_codec *codec, unsigned int res)
512 int cp_state = !!(res & AC_UNSOL_RES_CP_STATE); 514 int cp_state = !!(res & AC_UNSOL_RES_CP_STATE);
513 int cp_ready = !!(res & AC_UNSOL_RES_CP_READY); 515 int cp_ready = !!(res & AC_UNSOL_RES_CP_READY);
514 516
515 printk(KERN_INFO "HDMI non-intrinsic event: " 517 printk(KERN_INFO
516 "SUBTAG=0x%x CP_STATE=%d CP_READY=%d\n", 518 "HDMI content protection event: SUBTAG=0x%x CP_STATE=%d CP_READY=%d\n",
517 subtag, 519 subtag,
518 cp_state, 520 cp_state,
519 cp_ready); 521 cp_ready);
520 522
521 /* who cares? */ 523 /* TODO */
522 if (cp_state) 524 if (cp_state)
523 ; 525 ;
524 if (cp_ready) 526 if (cp_ready)
@@ -532,9 +534,7 @@ static void intel_hdmi_unsol_event(struct hda_codec *codec, unsigned int res)
532 int subtag = (res & AC_UNSOL_RES_SUBTAG) >> AC_UNSOL_RES_SUBTAG_SHIFT; 534 int subtag = (res & AC_UNSOL_RES_SUBTAG) >> AC_UNSOL_RES_SUBTAG_SHIFT;
533 535
534 if (tag != INTEL_HDMI_EVENT_TAG) { 536 if (tag != INTEL_HDMI_EVENT_TAG) {
535 snd_printd(KERN_INFO 537 snd_printd(KERN_INFO "Unexpected HDMI event tag 0x%x\n", tag);
536 "Unexpected HDMI unsolicited event tag 0x%x\n",
537 tag);
538 return; 538 return;
539 } 539 }
540 540