All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wu Fengguang <fengguang.wu@intel.com>
To: Takashi Iwai <tiwai@suse.de>
Cc: Wei Ni <wni@nvidia.com>,
	'alsa-devel' <alsa-devel@alsa-project.org>,
	'Pavel Hofman' <pavel.hofman@insite.cz>,
	'linux-kernel' <linux-kernel@vger.kernel.org>
Subject: [PATCH] hdmi - show debug message on changing audio infoframe
Date: Mon, 8 Mar 2010 10:45:38 +0800	[thread overview]
Message-ID: <20100308024538.GA24058@localhost> (raw)
In-Reply-To: <20100308024422.GA24030@localhost>

Also change printk level for the two others.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
 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);

WARNING: multiple messages have this Message-ID (diff)
From: Wu Fengguang <fengguang.wu@intel.com>
To: Takashi Iwai <tiwai@suse.de>
Cc: Wei Ni <wni@nvidia.com>,
	"'alsa-devel'" <alsa-devel@alsa-project.org>,
	"'linux-kernel'" <linux-kernel@vger.kernel.org>,
	"'Pavel Hofman'" <pavel.hofman@insite.cz>
Subject: [PATCH] hdmi - show debug message on changing audio infoframe
Date: Mon, 8 Mar 2010 10:45:38 +0800	[thread overview]
Message-ID: <20100308024538.GA24058@localhost> (raw)
In-Reply-To: <20100308024422.GA24030@localhost>

Also change printk level for the two others.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
 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);

  reply	other threads:[~2010-03-08  2:45 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-08  2:44 [PATCH] hdmi - merge common code for intelhdmi and nvhdmi Wu Fengguang
2010-03-08  2:45 ` Wu Fengguang [this message]
2010-03-08  2:45   ` [PATCH] hdmi - show debug message on changing audio infoframe Wu Fengguang
2010-03-08  7:24 ` [PATCH] hdmi - merge common code for intelhdmi and nvhdmi Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100308024538.GA24058@localhost \
    --to=fengguang.wu@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pavel.hofman@insite.cz \
    --cc=tiwai@suse.de \
    --cc=wni@nvidia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.