Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Wu Fengguang <fengguang.wu@intel.com>
To: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org,
	"Wu Fengguang" <fengguang.wu@intel.com>,
	"Shane W" <shane-alsa@csy.ca>,
	"David Härdeman" <david@hardeman.nu>
Subject: [PATCH 09/10] intelhdmi - sticky channel count
Date: Wed, 18 Nov 2009 12:38:07 +0800	[thread overview]
Message-ID: <20091118043935.830850076@intel.com> (raw)
In-Reply-To: 20091118043758.141785140@intel.com

[-- Attachment #1: hdmi-sticky-channel-count.patch --]
[-- Type: text/plain, Size: 1227 bytes --]

Don't change channel count if not necessary.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
 sound/pci/hda/patch_intelhdmi.c |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

--- sound-2.6.orig/sound/pci/hda/patch_intelhdmi.c	2009-11-05 16:48:43.000000000 +0800
+++ sound-2.6/sound/pci/hda/patch_intelhdmi.c	2009-11-05 16:49:22.000000000 +0800
@@ -422,24 +422,18 @@ static void hdmi_stop_infoframe_trans(st
 						AC_DIPXMIT_DISABLE);
 }
 
-#ifdef CONFIG_SND_DEBUG_VERBOSE
 static int hdmi_get_channel_count(struct hda_codec *codec, hda_nid_t nid)
 {
 	return 1 + snd_hda_codec_read(codec, nid, 0,
 					AC_VERB_GET_CVT_CHAN_COUNT, 0);
 }
-#endif
 
 static void hdmi_set_channel_count(struct hda_codec *codec,
 				   hda_nid_t nid, int chs)
 {
-	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CVT_CHAN_COUNT, chs - 1);
-
-#ifdef CONFIG_SND_DEBUG_VERBOSE
 	if (chs != hdmi_get_channel_count(codec, nid))
-		snd_printd(KERN_INFO "HDMI channel count: expect %d, get %d\n",
-			   chs, hdmi_get_channel_count(codec, nid));
-#endif
+		snd_hda_codec_write(codec, nid, 0,
+				    AC_VERB_SET_CVT_CHAN_COUNT, chs - 1);
 }
 
 static void hdmi_debug_channel_mapping(struct hda_codec *codec, hda_nid_t nid)

  parent reply	other threads:[~2009-11-18  4:42 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-18  4:37 [PATCH 00/10] Intel HDMI fixes v2 Wu Fengguang
2009-11-18  4:37 ` [PATCH 01/10] intelhdmi - fix audio infoframe fill size Wu Fengguang
2009-11-18  4:38 ` [PATCH 02/10] intelhdmi - fix channel mapping slot mask Wu Fengguang
2009-11-18  4:38 ` [PATCH 03/10] intelhdmi - export monitor-presence and ELD-valid status Wu Fengguang
2009-11-18  4:38 ` [PATCH 04/10] hda - introduce snd_hda_jack_detect() and snd_hda_pin_sense() Wu Fengguang
2009-11-18  4:38 ` [PATCH 05/10] intelhdmi - probe for monitor/eld presence at module init time Wu Fengguang
2009-11-18  9:04   ` Takashi Iwai
2009-11-18  9:16     ` Wu Fengguang
2009-11-18  4:38 ` [PATCH 06/10] intelhdmi - separate out infoframe checksum routine Wu Fengguang
2009-11-18  4:38 ` [PATCH 07/10] intelhdmi - sticky infoframe Wu Fengguang
2009-11-18  4:38 ` [PATCH 08/10] intelhdmi - sticky stream id and format Wu Fengguang
2009-11-18  4:38 ` Wu Fengguang [this message]
2009-11-18  4:38 ` [PATCH 10/10] hda - show EPSS capability in proc Wu Fengguang
2009-11-18  4:58 ` [PATCH 00/10] Intel HDMI fixes v2 Wu Fengguang
2009-11-18  7:04   ` 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=20091118043935.830850076@intel.com \
    --to=fengguang.wu@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=david@hardeman.nu \
    --cc=shane-alsa@csy.ca \
    --cc=tiwai@suse.de \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox