]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
.32 patches
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 7 May 2010 19:37:38 +0000 (12:37 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 7 May 2010 19:37:38 +0000 (12:37 -0700)
12 files changed:
queue-2.6.32/alsa-hda-add-pci-quirk-for-hp-dv6-1110ax.patch [new file with mode: 0644]
queue-2.6.32/alsa-hda-fix-0-db-for-packard-bell-models-using-conexant-cx20549-venice.patch [new file with mode: 0644]
queue-2.6.32/alsa-hda-fix-max-pcm-level-to-0-db-for-fujitsu-siemens-laptops-using-cx20549-venice.patch [new file with mode: 0644]
queue-2.6.32/alsa-hda-use-alc880_f1734-quirk-for-fujitsu-siemens-amilo-xi-1526.patch [new file with mode: 0644]
queue-2.6.32/alsa-hda-use-lpib-quirk-for-dg965ot-board-version-aad63733-203.patch [new file with mode: 0644]
queue-2.6.32/alsa-hda-use-olpc-xo-1_5-quirk-for-toshiba-satellite-p500-pspgsc-01800t.patch [new file with mode: 0644]
queue-2.6.32/alsa-hda-use-olpc-xo-1_5-quirk-for-toshiba-satellite-pro-t130-15f.patch [new file with mode: 0644]
queue-2.6.32/alsa-hda-use-stac_dell_m6_both-quirk-for-dell-studio-1558.patch [new file with mode: 0644]
queue-2.6.32/alsa-hda-use-stac_dell_m6_both-quirk-for-dell-studio-xps-1645.patch [new file with mode: 0644]
queue-2.6.32/alsa-snd-meastro3-add-amp_gpio-quirk-for-compaq-evo-n600c.patch [new file with mode: 0644]
queue-2.6.32/alsa-snd-meastro3-ignore-spurious-hv-interrupts-during-suspend-resume.patch [new file with mode: 0644]
queue-2.6.32/series

diff --git a/queue-2.6.32/alsa-hda-add-pci-quirk-for-hp-dv6-1110ax.patch b/queue-2.6.32/alsa-hda-add-pci-quirk-for-hp-dv6-1110ax.patch
new file mode 100644 (file)
index 0000000..49e2275
--- /dev/null
@@ -0,0 +1,32 @@
+From e3d2530a6cea80987f77b75d8784a00f3aaf22ff Mon Sep 17 00:00:00 2001
+From: Kunal Gangakhedkar <kunal.gangakhedkar@gmail.com>
+Date: Sat, 20 Mar 2010 23:08:01 +0530
+Subject: ALSA: hda - Add PCI quirk for HP dv6-1110ax.
+
+From: Kunal Gangakhedkar <kunal.gangakhedkar@gmail.com>
+
+commit e3d2530a6cea80987f77b75d8784a00f3aaf22ff upstream.
+
+Adding this PCI quirk fixes the board config detection.
+This also fixes jack sensing by using "hp_detect=1" via properly detected
+board config.
+
+Signed-off-by: Kunal Gangakhedkar <kunal.gangakhedkar@gmail.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/pci/hda/patch_sigmatel.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/sound/pci/hda/patch_sigmatel.c
++++ b/sound/pci/hda/patch_sigmatel.c
+@@ -1712,6 +1712,8 @@ static struct snd_pci_quirk stac92hd71bx
+                     "HP HDX", STAC_HP_HDX),  /* HDX16 */
+       SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3620,
+                     "HP dv6", STAC_HP_DV5),
++      SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3061,
++                    "HP dv6", STAC_HP_DV5), /* HP dv6-1110ax */
+       SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x7010,
+                     "HP", STAC_HP_DV5),
+       SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233,
diff --git a/queue-2.6.32/alsa-hda-fix-0-db-for-packard-bell-models-using-conexant-cx20549-venice.patch b/queue-2.6.32/alsa-hda-fix-0-db-for-packard-bell-models-using-conexant-cx20549-venice.patch
new file mode 100644 (file)
index 0000000..b22fc44
--- /dev/null
@@ -0,0 +1,38 @@
+From 8f0f5ff6777104084b4b2e1ae079541c2a6ed6d9 Mon Sep 17 00:00:00 2001
+From: Daniel T Chen <crimsun@ubuntu.com>
+Date: Wed, 28 Apr 2010 18:00:11 -0400
+Subject: ALSA: hda: Fix 0 dB for Packard Bell models using Conexant CX20549 (Venice)
+
+From: Daniel T Chen <crimsun@ubuntu.com>
+
+commit 8f0f5ff6777104084b4b2e1ae079541c2a6ed6d9 upstream.
+
+BugLink: https://launchpad.net/bugs/541802
+
+The OR's hardware distorts at PCM 100% because it does not correspond to
+0 dB. Fix this in patch_cxt5045() for all Packard Bell models.
+
+Reported-by: Valombre
+Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/pci/hda/patch_conexant.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/sound/pci/hda/patch_conexant.c
++++ b/sound/pci/hda/patch_conexant.c
+@@ -1175,9 +1175,10 @@ static int patch_cxt5045(struct hda_code
+       switch (codec->subsystem_id >> 16) {
+       case 0x103c:
++      case 0x1631:
+       case 0x1734:
+-              /* HP & Fujitsu-Siemens laptops have really bad sound over 0dB
+-               * on NID 0x17. Fix max PCM level to 0 dB
++              /* HP, Packard Bell, & Fujitsu-Siemens laptops have really bad
++               * sound over 0dB on NID 0x17. Fix max PCM level to 0 dB
+                * (originally it has 0x2b steps with 0dB offset 0x14)
+                */
+               snd_hda_override_amp_caps(codec, 0x17, HDA_INPUT,
diff --git a/queue-2.6.32/alsa-hda-fix-max-pcm-level-to-0-db-for-fujitsu-siemens-laptops-using-cx20549-venice.patch b/queue-2.6.32/alsa-hda-fix-max-pcm-level-to-0-db-for-fujitsu-siemens-laptops-using-cx20549-venice.patch
new file mode 100644 (file)
index 0000000..4e850ad
--- /dev/null
@@ -0,0 +1,40 @@
+From 0b587fc4d35afb1bc0fc3d890084bb14c78372dc Mon Sep 17 00:00:00 2001
+From: Daniel T Chen <crimsun@ubuntu.com>
+Date: Wed, 25 Nov 2009 18:27:20 -0500
+Subject: ALSA: hda: Fix max PCM level to 0 dB for Fujitsu-Siemens laptops using CX20549 (Venice)
+
+From: Daniel T Chen <crimsun@ubuntu.com>
+
+commit 0b587fc4d35afb1bc0fc3d890084bb14c78372dc upstream.
+
+BugLink: https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4792
+
+Cristian reported that these models have really bad sound above 6 dB
+and proposed the original patch. I've updated the comment to reflect
+this change.
+
+Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
+Reported-by: Cristian Klein
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/pci/hda/patch_conexant.c |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+--- a/sound/pci/hda/patch_conexant.c
++++ b/sound/pci/hda/patch_conexant.c
+@@ -1175,9 +1175,10 @@ static int patch_cxt5045(struct hda_code
+       switch (codec->subsystem_id >> 16) {
+       case 0x103c:
+-              /* HP laptop has a really bad sound over 0dB on NID 0x17.
+-               * Fix max PCM level to 0 dB
+-               * (originall it has 0x2b steps with 0dB offset 0x14)
++      case 0x1734:
++              /* HP & Fujitsu-Siemens laptops have really bad sound over 0dB
++               * on NID 0x17. Fix max PCM level to 0 dB
++               * (originally it has 0x2b steps with 0dB offset 0x14)
+                */
+               snd_hda_override_amp_caps(codec, 0x17, HDA_INPUT,
+                                         (0x14 << AC_AMPCAP_OFFSET_SHIFT) |
diff --git a/queue-2.6.32/alsa-hda-use-alc880_f1734-quirk-for-fujitsu-siemens-amilo-xi-1526.patch b/queue-2.6.32/alsa-hda-use-alc880_f1734-quirk-for-fujitsu-siemens-amilo-xi-1526.patch
new file mode 100644 (file)
index 0000000..860c4d9
--- /dev/null
@@ -0,0 +1,38 @@
+From 3353541fe533350a22a03e2fb7dc085b35912575 Mon Sep 17 00:00:00 2001
+From: Daniel T Chen <crimsun@ubuntu.com>
+Date: Thu, 22 Apr 2010 07:15:26 -0400
+Subject: ALSA: hda: Use ALC880_F1734 quirk for Fujitsu Siemens AMILO Xi 1526
+
+From: Daniel T Chen <crimsun@ubuntu.com>
+
+commit 3353541fe533350a22a03e2fb7dc085b35912575 upstream.
+
+BugLink: https://launchpad.net/bugs/567494
+
+The OR has verified that the existing model quirk, ALC880_UNIWILL,
+is insufficient for audible playback and capture by default. Instead,
+the ALC880_F1734 model quirk needs to be used.
+
+This change is necessary for both 2.6.32.11 and 2.6.33.2.
+
+Reported-by: Arnaud Malpeyre <amalpeyre@gmail.com>
+Tested-by: Arnaud Malpeyre <amalpeyre@gmail.com>
+Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/pci/hda/patch_realtek.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -3971,7 +3971,7 @@ static struct snd_pci_quirk alc880_cfg_t
+       SND_PCI_QUIRK(0x1695, 0x4012, "EPox EP-5LDA", ALC880_5ST_DIG),
+       SND_PCI_QUIRK(0x1734, 0x107c, "FSC F1734", ALC880_F1734),
+       SND_PCI_QUIRK(0x1734, 0x1094, "FSC Amilo M1451G", ALC880_FUJITSU),
+-      SND_PCI_QUIRK(0x1734, 0x10ac, "FSC", ALC880_UNIWILL),
++      SND_PCI_QUIRK(0x1734, 0x10ac, "FSC AMILO Xi 1526", ALC880_F1734),
+       SND_PCI_QUIRK(0x1734, 0x10b0, "Fujitsu", ALC880_FUJITSU),
+       SND_PCI_QUIRK(0x1854, 0x0018, "LG LW20", ALC880_LG_LW),
+       SND_PCI_QUIRK(0x1854, 0x003b, "LG", ALC880_LG),
diff --git a/queue-2.6.32/alsa-hda-use-lpib-quirk-for-dg965ot-board-version-aad63733-203.patch b/queue-2.6.32/alsa-hda-use-lpib-quirk-for-dg965ot-board-version-aad63733-203.patch
new file mode 100644 (file)
index 0000000..c2f567b
--- /dev/null
@@ -0,0 +1,37 @@
+From 0e0280dc2b0c7395a880d25544b47f3e3e3f79db Mon Sep 17 00:00:00 2001
+From: Daniel T Chen <crimsun@ubuntu.com>
+Date: Wed, 21 Apr 2010 19:55:43 -0400
+Subject: ALSA: hda: Use LPIB quirk for DG965OT board version AAD63733-203
+
+From: Daniel T Chen <crimsun@ubuntu.com>
+
+commit 0e0280dc2b0c7395a880d25544b47f3e3e3f79db upstream.
+
+BugLink: https://launchpad.net/bugs/459083
+
+The OR has verified with 2.6.32.11 and the latest alsa-driver stable
+daily snapshot that position_fix=1 is necessary for the external mic
+to work and for PulseAudio not to crash constantly.
+
+This patch is necessary also for 2.6.32.11 and 2.6.33.2.
+
+Reported-by: <imwithid@yahoo.com>
+Tested-by: <imwithid@yahoo.com>
+Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/pci/hda/hda_intel.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -2236,6 +2236,7 @@ static struct snd_pci_quirk position_fix
+       SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB),
+       SND_PCI_QUIRK(0x1565, 0x820f, "Biostar Microtech", POS_FIX_LPIB),
+       SND_PCI_QUIRK(0x1565, 0x8218, "Biostar Microtech", POS_FIX_LPIB),
++      SND_PCI_QUIRK(0x8086, 0x2503, "DG965OT AAD63733-203", POS_FIX_LPIB),
+       SND_PCI_QUIRK(0x8086, 0xd601, "eMachines T5212", POS_FIX_LPIB),
+       {}
+ };
diff --git a/queue-2.6.32/alsa-hda-use-olpc-xo-1_5-quirk-for-toshiba-satellite-p500-pspgsc-01800t.patch b/queue-2.6.32/alsa-hda-use-olpc-xo-1_5-quirk-for-toshiba-satellite-p500-pspgsc-01800t.patch
new file mode 100644 (file)
index 0000000..fa2c6e2
--- /dev/null
@@ -0,0 +1,33 @@
+From c53666813813a0ea3d0391e1911eefc05a5e6b4f Mon Sep 17 00:00:00 2001
+From: Daniel T Chen <crimsun@ubuntu.com>
+Date: Tue, 4 May 2010 22:07:58 -0400
+Subject: ALSA: hda: Use olpc-xo-1_5 quirk for Toshiba Satellite P500-PSPGSC-01800T
+
+From: Daniel T Chen <crimsun@ubuntu.com>
+
+commit c53666813813a0ea3d0391e1911eefc05a5e6b4f upstream.
+
+BugLink: https://launchpad.net/bugs/549267
+
+The OR verified that using the olpc-xo-1_5 model quirk allows the
+headphones to be audible when inserted into the jack. Capture was
+also verified to work correctly.
+
+Reported-by: Richard Gagne
+Tested-by: Richard Gagne
+Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
+index e1323e4..924c122 100644
+--- a/sound/pci/hda/patch_conexant.c
++++ b/sound/pci/hda/patch_conexant.c
+@@ -2842,6 +2842,7 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = {
+                     CXT5066_DELL_LAPTOP),
+       SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5),
+       SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTO),
++      SND_PCI_QUIRK(0x1179, 0xff50, "Toshiba Satellite P500-PSPGSC-01800T", CXT5066_OLPC_XO_1_5),
+       SND_PCI_QUIRK(0x1179, 0xffe0, "Toshiba Satellite Pro T130-15F", CXT5066_OLPC_XO_1_5),
+       SND_PCI_QUIRK(0x17aa, 0x3a0d, "ideapad", CXT5066_IDEAPAD),
+       {}
diff --git a/queue-2.6.32/alsa-hda-use-olpc-xo-1_5-quirk-for-toshiba-satellite-pro-t130-15f.patch b/queue-2.6.32/alsa-hda-use-olpc-xo-1_5-quirk-for-toshiba-satellite-pro-t130-15f.patch
new file mode 100644 (file)
index 0000000..4ba6a08
--- /dev/null
@@ -0,0 +1,35 @@
+From 4442dd4613fe3795b4c8a5f42fc96b7ffb90d01a Mon Sep 17 00:00:00 2001
+From: Daniel T Chen <crimsun@ubuntu.com>
+Date: Mon, 3 May 2010 20:39:31 -0400
+Subject: ALSA: hda: Use olpc-xo-1_5 quirk for Toshiba Satellite Pro T130-15F
+
+From: Daniel T Chen <crimsun@ubuntu.com>
+
+commit 4442dd4613fe3795b4c8a5f42fc96b7ffb90d01a upstream.
+
+BugLink: https://launchpad.net/bugs/573284
+
+The OR verified that using the olpc-xo-1_5 model quirk allows the
+headphones to be audible when inserted into the jack. Capture was
+also verified to work correctly.
+
+Reported-by: Andy Couldrake <acouldrake@googlemail.com>
+Tested-by: Andy Couldrake <acouldrake@googlemail.com>
+Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/pci/hda/patch_conexant.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/pci/hda/patch_conexant.c
++++ b/sound/pci/hda/patch_conexant.c
+@@ -2350,6 +2350,7 @@ static struct snd_pci_quirk cxt5066_cfg_
+       SND_PCI_QUIRK(0x1028, 0x02f5, "Dell",
+                     CXT5066_DELL_LAPTOP),
+       SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5),
++      SND_PCI_QUIRK(0x1179, 0xffe0, "Toshiba Satellite Pro T130-15F", CXT5066_OLPC_XO_1_5),
+       {}
+ };
diff --git a/queue-2.6.32/alsa-hda-use-stac_dell_m6_both-quirk-for-dell-studio-1558.patch b/queue-2.6.32/alsa-hda-use-stac_dell_m6_both-quirk-for-dell-studio-1558.patch
new file mode 100644 (file)
index 0000000..16b9c51
--- /dev/null
@@ -0,0 +1,37 @@
+From 5c1bccf645d4ab65e4c7502acb42e8b9afdb5bdc Mon Sep 17 00:00:00 2001
+From: Daniel T Chen <crimsun@ubuntu.com>
+Date: Thu, 22 Apr 2010 17:54:45 -0400
+Subject: ALSA: hda: Use STAC_DELL_M6_BOTH quirk for Dell Studio 1558
+
+From: Daniel T Chen <crimsun@ubuntu.com>
+
+commit 5c1bccf645d4ab65e4c7502acb42e8b9afdb5bdc upstream.
+
+BugLink: https://launchpad.net/bugs/568600
+
+The OR has verified that the dell-m6 model quirk is necessary for audio
+to be audible by default on the Dell Studio XPS 1645.
+
+This change is necessary for 2.6.32.11 and 2.6.33.2 alike.
+
+Reported-by: Andy Ross <andy@plausible.org>
+Tested-by: Andy Ross <andy@plausible.org>
+Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/pci/hda/patch_sigmatel.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/sound/pci/hda/patch_sigmatel.c
++++ b/sound/pci/hda/patch_sigmatel.c
+@@ -1594,6 +1594,8 @@ static struct snd_pci_quirk stac92hd73xx
+                               "Dell Studio 1557", STAC_DELL_M6_DMIC),
+       SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02fe,
+                               "Dell Studio XPS 1645", STAC_DELL_M6_BOTH),
++      SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0413,
++                              "Dell Studio 1558", STAC_DELL_M6_BOTH),
+       {} /* terminator */
+ };
diff --git a/queue-2.6.32/alsa-hda-use-stac_dell_m6_both-quirk-for-dell-studio-xps-1645.patch b/queue-2.6.32/alsa-hda-use-stac_dell_m6_both-quirk-for-dell-studio-xps-1645.patch
new file mode 100644 (file)
index 0000000..c5e87e1
--- /dev/null
@@ -0,0 +1,37 @@
+From aac78daf8f37256283f56820ae858add7139c56c Mon Sep 17 00:00:00 2001
+From: Daniel T Chen <crimsun@ubuntu.com>
+Date: Wed, 21 Apr 2010 20:41:52 -0400
+Subject: ALSA: hda: Use STAC_DELL_M6_BOTH quirk for Dell Studio XPS 1645
+
+From: Daniel T Chen <crimsun@ubuntu.com>
+
+commit aac78daf8f37256283f56820ae858add7139c56c upstream.
+
+BugLink: https://launchpad.net/bugs/553002
+
+The OR has verified that the dell-m6 model quirk is necessary for audio
+to be audible by default on the Dell Studio XPS 1645.
+
+This change is necessary for 2.6.32.11 and 2.6.33.2 alike.
+
+Reported-by: Robert Chambers
+Tested-by: Robert Chambers
+Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/pci/hda/patch_sigmatel.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/sound/pci/hda/patch_sigmatel.c
++++ b/sound/pci/hda/patch_sigmatel.c
+@@ -1592,6 +1592,8 @@ static struct snd_pci_quirk stac92hd73xx
+                               "Dell Studio 1555", STAC_DELL_M6_DMIC),
+       SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02bd,
+                               "Dell Studio 1557", STAC_DELL_M6_DMIC),
++      SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02fe,
++                              "Dell Studio XPS 1645", STAC_DELL_M6_BOTH),
+       {} /* terminator */
+ };
diff --git a/queue-2.6.32/alsa-snd-meastro3-add-amp_gpio-quirk-for-compaq-evo-n600c.patch b/queue-2.6.32/alsa-snd-meastro3-add-amp_gpio-quirk-for-compaq-evo-n600c.patch
new file mode 100644 (file)
index 0000000..098ba15
--- /dev/null
@@ -0,0 +1,34 @@
+From 7efbfd1ae98ef9efe06352e2a1ad83e8c14ceeb1 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 21 Apr 2010 11:04:06 -0400
+Subject: ALSA: snd-meastro3: Add amp_gpio quirk for Compaq EVO N600C
+
+From: Hans de Goede <hdegoede@redhat.com>
+
+commit 7efbfd1ae98ef9efe06352e2a1ad83e8c14ceeb1 upstream.
+
+Without this quirk sound stops working after suspend resume. With this quirk,
+one still needs to manually unmute the master volume control after a suspend /
+/ resume cycle. That is fixed in another patch in this set.
+
+Note that this patch was submitted to the alsa bug tracker a long time ago:
+https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4319
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/pci/maestro3.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/pci/maestro3.c
++++ b/sound/pci/maestro3.c
+@@ -884,6 +884,7 @@ static struct pci_device_id snd_m3_ids[]
+ MODULE_DEVICE_TABLE(pci, snd_m3_ids);
+ static struct snd_pci_quirk m3_amp_quirk_list[] __devinitdata = {
++      SND_PCI_QUIRK(0x0E11, 0x0094, "Compaq Evo N600c", 0x0c),
+       SND_PCI_QUIRK(0x10f7, 0x833e, "Panasonic CF-28", 0x0d),
+       SND_PCI_QUIRK(0x10f7, 0x833d, "Panasonic CF-72", 0x0d),
+       SND_PCI_QUIRK(0x1033, 0x80f1, "NEC LM800J/7", 0x03),
diff --git a/queue-2.6.32/alsa-snd-meastro3-ignore-spurious-hv-interrupts-during-suspend-resume.patch b/queue-2.6.32/alsa-snd-meastro3-ignore-spurious-hv-interrupts-during-suspend-resume.patch
new file mode 100644 (file)
index 0000000..e954c81
--- /dev/null
@@ -0,0 +1,61 @@
+From 715aa675338ce6e1a3b4f77cf87ea611f93058a8 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 21 Apr 2010 11:04:08 -0400
+Subject: ALSA: snd-meastro3: Ignore spurious HV interrupts during suspend / resume
+
+From: Hans de Goede <hdegoede@redhat.com>
+
+commit 715aa675338ce6e1a3b4f77cf87ea611f93058a8 upstream.
+
+Ignore spurious HV interrupts during suspend / resume, this avoids
+mistaking them for a mute button press. This is not very pretty but
+it seems the only way to fix the master volume control gets muted
+after suspend issue I'm seeing. Note that the es1968 driver is doing
+exactly the same.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/pci/maestro3.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/sound/pci/maestro3.c
++++ b/sound/pci/maestro3.c
+@@ -849,6 +849,7 @@ struct snd_m3 {
+       struct snd_kcontrol *master_switch;
+       struct snd_kcontrol *master_volume;
+       struct tasklet_struct hwvol_tq;
++      unsigned int in_suspend;
+ #ifdef CONFIG_PM
+       u16 *suspend_mem;
+@@ -1614,6 +1615,11 @@ static void snd_m3_update_hw_volume(unsi
+       outb(0x88, chip->iobase + SHADOW_MIX_REG_MASTER);
+       outb(0x88, chip->iobase + HW_VOL_COUNTER_MASTER);
++      /* Ignore spurious HV interrupts during suspend / resume, this avoids
++         mistaking them for a mute button press. */
++      if (chip->in_suspend)
++              return;
++
+       if (!chip->master_switch || !chip->master_volume)
+               return;
+@@ -2425,6 +2431,7 @@ static int m3_suspend(struct pci_dev *pc
+       if (chip->suspend_mem == NULL)
+               return 0;
++      chip->in_suspend = 1;
+       snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+       snd_pcm_suspend_all(chip->pcm);
+       snd_ac97_suspend(chip->ac97);
+@@ -2498,6 +2505,7 @@ static int m3_resume(struct pci_dev *pci
+       snd_m3_hv_init(chip);
+       snd_power_change_state(card, SNDRV_CTL_POWER_D0);
++      chip->in_suspend = 0;
+       return 0;
+ }
+ #endif /* CONFIG_PM */
index 2e6f0d672fb7bd252999bc1f68c0aa41d9208ce4..021953ed9fd66a4188b97bc560b04ad6d2d90695 100644 (file)
@@ -45,3 +45,14 @@ x86-64-clear-a-64-bit-fs-gs-base-on-fork-if-selector-is-nonzero.patch
 x86-disable-large-pages-on-cpus-with-atom-erratum-aae44.patch
 x86-k8-nb-fix-boot-crash-enable-k8_northbridges-unconditionally-on-amd-systems.patch
 x86-amd-fix-stale-cpuid4_info-shared_map-data-in-shared_cpu_map-cpumasks.patch
+alsa-hda-use-lpib-quirk-for-dg965ot-board-version-aad63733-203.patch
+alsa-hda-add-pci-quirk-for-hp-dv6-1110ax.patch
+alsa-hda-use-stac_dell_m6_both-quirk-for-dell-studio-xps-1645.patch
+alsa-hda-use-stac_dell_m6_both-quirk-for-dell-studio-1558.patch
+alsa-hda-use-alc880_f1734-quirk-for-fujitsu-siemens-amilo-xi-1526.patch
+alsa-snd-meastro3-add-amp_gpio-quirk-for-compaq-evo-n600c.patch
+alsa-snd-meastro3-ignore-spurious-hv-interrupts-during-suspend-resume.patch
+alsa-hda-fix-max-pcm-level-to-0-db-for-fujitsu-siemens-laptops-using-cx20549-venice.patch
+alsa-hda-fix-0-db-for-packard-bell-models-using-conexant-cx20549-venice.patch
+alsa-hda-use-olpc-xo-1_5-quirk-for-toshiba-satellite-pro-t130-15f.patch
+alsa-hda-use-olpc-xo-1_5-quirk-for-toshiba-satellite-p500-pspgsc-01800t.patch