From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753828Ab0CHCpq (ORCPT ); Sun, 7 Mar 2010 21:45:46 -0500 Received: from mga01.intel.com ([192.55.52.88]:8629 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753438Ab0CHCpk (ORCPT ); Sun, 7 Mar 2010 21:45:40 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.49,600,1262592000"; d="scan'208";a="546941068" Date: Mon, 8 Mar 2010 10:45:38 +0800 From: Wu Fengguang To: Takashi Iwai Cc: Wei Ni , "'alsa-devel'" , "'linux-kernel'" , "'Pavel Hofman'" Subject: [PATCH] hdmi - show debug message on changing audio infoframe Message-ID: <20100308024538.GA24058@localhost> References: <20100308024422.GA24030@localhost> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100308024422.GA24030@localhost> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Also change printk level for the two others. Signed-off-by: Wu Fengguang --- sound/pci/hda/patch_hdmi.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) --- sound-2.6.orig/sound/pci/hda/patch_hdmi.c 2010-03-08 10:11:00.000000000 +0800 +++ sound-2.6/sound/pci/hda/patch_hdmi.c 2010-03-08 10:17:35.000000000 +0800 @@ -398,9 +398,8 @@ static int hdmi_setup_channel_allocation } 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(s 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(s 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);