[kernel] r14013 - in dists/lenny/linux-2.6/debian: . patches/bugfix/all patches/series
Moritz Muehlenhoff
jmm at alioth.debian.org
Sun Jul 26 14:20:43 UTC 2009
Author: jmm
Date: Sun Jul 26 14:20:38 2009
New Revision: 14013
Log:
* ALSA: HDA patch_via.c: Fix inversion of surround and side channels
(Closes: #538391)
Added:
dists/lenny/linux-2.6/debian/patches/bugfix/all/alsa-via-fix-inversion-of-sound-and-side-channels.patch
Modified:
dists/lenny/linux-2.6/debian/changelog
dists/lenny/linux-2.6/debian/patches/series/18
Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog Sat Jul 25 20:59:49 2009 (r14012)
+++ dists/lenny/linux-2.6/debian/changelog Sun Jul 26 14:20:38 2009 (r14013)
@@ -27,6 +27,8 @@
* Emit HPET warning only once to avoid syslog floods, which occur on
some systems like HP DC7900 (Closes: #512617)
* Fix support for AverMedia AverTV Cardbus Hybrid E506R (Closes: #511385)
+ * ALSA: HDA patch_via.c: Fix inversion of surround and side channels
+ (Closes: #538391)
[ dann frazier ]
* sata_nv: avoid link reset on controllers where it's broken
Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/alsa-via-fix-inversion-of-sound-and-side-channels.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/alsa-via-fix-inversion-of-sound-and-side-channels.patch Sun Jul 26 14:20:38 2009 (r14013)
@@ -0,0 +1,117 @@
+From: Harald Welte <HaraldWelte at viatech.com>
+Date: Tue, 9 Sep 2008 07:53:36 +0000 (+0800)
+Subject: ALSA: HDA patch_via.c: Fix inversion of surround and side channels
+X-Git-Tag: v2.6.28-rc1~20^2~120
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=fb4cb772c0b22f7bce0b151ef5712e80d434bc97;hp=76d9b0dd78197c473892e44b1fbf6be4592cc440
+
+ALSA: HDA patch_via.c: Fix inversion of surround and side channels
+
+In the current driver, there is a consistent mistake between the SURROUND and
+the SIDE channels. This patch fixes it.
+
+Signed-off-by: Harald Welte <HaraldWelte at viatech.com>
+Signed-off-by: Takashi Iwai <tiwai at suse.de>
+Signed-off-by: Jaroslav Kysela <perex at perex.cz>
+---
+
+diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
+index d397f52..bae6273 100644
+--- a/sound/pci/hda/patch_via.c
++++ b/sound/pci/hda/patch_via.c
+@@ -30,6 +30,7 @@
+ /* 2007-09-12 Lydia Wang Add EAPD enable during driver initialization */
+ /* 2007-09-17 Lydia Wang Add VT1708B codec support */
+ /* 2007-11-14 Lydia Wang Add VT1708A codec HP and CD pin connect config */
++/* 2008-02-03 Lydia Wang Fix Rear channels and Back channels inverse issue */
+ /* */
+ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+@@ -660,10 +661,10 @@ static int vt1708_auto_fill_dac_nids(struct via_spec *spec,
+ spec->multiout.dac_nids[i] = 0x12;
+ break;
+ case AUTO_SEQ_SURROUND:
+- spec->multiout.dac_nids[i] = 0x13;
++ spec->multiout.dac_nids[i] = 0x11;
+ break;
+ case AUTO_SEQ_SIDE:
+- spec->multiout.dac_nids[i] = 0x11;
++ spec->multiout.dac_nids[i] = 0x13;
+ break;
+ }
+ }
+@@ -688,7 +689,7 @@ static int vt1708_auto_create_multi_out_ctls(struct via_spec *spec,
+ continue;
+
+ if (i != AUTO_SEQ_FRONT)
+- nid_vol = 0x1b - i + 1;
++ nid_vol = 0x18 + i;
+
+ if (i == AUTO_SEQ_CENLFE) {
+ /* Center/LFE */
+@@ -1118,11 +1119,11 @@ static int vt1709_auto_fill_dac_nids(struct via_spec *spec,
+ break;
+ case AUTO_SEQ_SURROUND:
+ /* AOW3 */
+- spec->multiout.dac_nids[i] = 0x27;
++ spec->multiout.dac_nids[i] = 0x11;
+ break;
+ case AUTO_SEQ_SIDE:
+ /* AOW1 */
+- spec->multiout.dac_nids[i] = 0x11;
++ spec->multiout.dac_nids[i] = 0x27;
+ break;
+ default:
+ break;
+@@ -1231,26 +1232,26 @@ static int vt1709_auto_create_multi_out_ctls(struct via_spec *spec,
+ } else if (i == AUTO_SEQ_SURROUND) {
+ sprintf(name, "%s Playback Volume", chname[i]);
+ err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,
+- HDA_COMPOSE_AMP_VAL(0x29, 3, 0,
++ HDA_COMPOSE_AMP_VAL(0x1a, 3, 0,
+ HDA_OUTPUT));
+ if (err < 0)
+ return err;
+ sprintf(name, "%s Playback Switch", chname[i]);
+ err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,
+- HDA_COMPOSE_AMP_VAL(0x29, 3, 0,
++ HDA_COMPOSE_AMP_VAL(0x1a, 3, 0,
+ HDA_OUTPUT));
+ if (err < 0)
+ return err;
+ } else if (i == AUTO_SEQ_SIDE) {
+ sprintf(name, "%s Playback Volume", chname[i]);
+ err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,
+- HDA_COMPOSE_AMP_VAL(0x1a, 3, 0,
++ HDA_COMPOSE_AMP_VAL(0x29, 3, 0,
+ HDA_OUTPUT));
+ if (err < 0)
+ return err;
+ sprintf(name, "%s Playback Switch", chname[i]);
+ err = via_add_control(spec, VIA_CTL_WIDGET_MUTE, name,
+- HDA_COMPOSE_AMP_VAL(0x1a, 3, 0,
++ HDA_COMPOSE_AMP_VAL(0x29, 3, 0,
+ HDA_OUTPUT));
+ if (err < 0)
+ return err;
+@@ -1690,10 +1691,10 @@ static int vt1708B_auto_fill_dac_nids(struct via_spec *spec,
+ spec->multiout.dac_nids[i] = 0x24;
+ break;
+ case AUTO_SEQ_SURROUND:
+- spec->multiout.dac_nids[i] = 0x25;
++ spec->multiout.dac_nids[i] = 0x11;
+ break;
+ case AUTO_SEQ_SIDE:
+- spec->multiout.dac_nids[i] = 0x11;
++ spec->multiout.dac_nids[i] = 0x25;
+ break;
+ }
+ }
+@@ -1708,7 +1709,7 @@ static int vt1708B_auto_create_multi_out_ctls(struct via_spec *spec,
+ {
+ char name[32];
+ static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" };
+- hda_nid_t nid_vols[] = {0x16, 0x27, 0x26, 0x18};
++ hda_nid_t nid_vols[] = {0x16, 0x18, 0x26, 0x27};
+ hda_nid_t nid, nid_vol = 0;
+ int i, err;
+
Modified: dists/lenny/linux-2.6/debian/patches/series/18
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/18 Sat Jul 25 20:59:49 2009 (r14012)
+++ dists/lenny/linux-2.6/debian/patches/series/18 Sun Jul 26 14:20:38 2009 (r14013)
@@ -13,4 +13,4 @@
+ bugfix/all/hpet-avoid-log-flooding.patch
+ bugfix/all/video-support-avertv-cardbus-hybrid-e506r.patch
+ bugfix/all/fbmon-work-around-compiler-bug.patch
-
++ bugfix/all/alsa-via-fix-inversion-of-sound-and-side-channels.patch
More information about the Kernel-svn-changes
mailing list