4.9-stable patches

added patches:
	alsa-hda-add-laptop-imic-fixup-for-asus-m9v-laptop.patch
	alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch

diff --git a/queue-4.9/alsa-hda-add-laptop-imic-fixup-for-asus-m9v-laptop.patch b/queue-4.9/alsa-hda-add-laptop-imic-fixup-for-asus-m9v-laptop.patch
new file mode 100644 (file)
index 0000000..0d300a6
--- /dev/null
+++ b/queue-4.9/alsa-hda-add-laptop-imic-fixup-for-asus-m9v-laptop.patch
@@ -0,0 +1,32 @@
+From 7b485d175631be676424aedb8cd2f66d0c93da78 Mon Sep 17 00:00:00 2001
+From: "Shih-Yuan Lee (FourDollars)" <fourdollars@debian.org>
+Date: Fri, 20 Sep 2019 21:40:53 +0800
+Subject: ALSA: hda - Add laptop imic fixup for ASUS M9V laptop
+
+From: Shih-Yuan Lee (FourDollars) <fourdollars@debian.org>
+
+commit 7b485d175631be676424aedb8cd2f66d0c93da78 upstream.
+
+The same fixup to enable laptop imic is needed for ASUS M9V with AD1986A
+codec like another HP machine.
+
+Signed-off-by: Shih-Yuan Lee (FourDollars) <fourdollars@debian.org>
+Cc: <stable@vger.kernel.org>
+Link: https://lore.kernel.org/r/20190920134052.GA8035@localhost
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_analog.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/pci/hda/patch_analog.c
++++ b/sound/pci/hda/patch_analog.c
+@@ -370,6 +370,7 @@ static const struct hda_fixup ad1986a_fi
+ 
+ static const struct snd_pci_quirk ad1986a_fixup_tbl[] = {
+       SND_PCI_QUIRK(0x103c, 0x30af, "HP B2800", AD1986A_FIXUP_LAPTOP_IMIC),
++      SND_PCI_QUIRK(0x1043, 0x1153, "ASUS M9V", AD1986A_FIXUP_LAPTOP_IMIC),
+       SND_PCI_QUIRK(0x1043, 0x1443, "ASUS Z99He", AD1986A_FIXUP_EAPD),
+       SND_PCI_QUIRK(0x1043, 0x1447, "ASUS A8JN", AD1986A_FIXUP_EAPD),
+       SND_PCI_QUIRK_MASK(0x1043, 0xff00, 0x8100, "ASUS P5", AD1986A_FIXUP_3STACK),

diff --git a/queue-4.9/alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch b/queue-4.9/alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch
new file mode 100644 (file)
index 0000000..64d06dd
--- /dev/null
+++ b/queue-4.9/alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch
@@ -0,0 +1,37 @@
+From d2c63b7dfd06788a466d5ec8a850491f084c5fc2 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Fri, 20 Sep 2019 09:30:40 +0200
+Subject: ALSA: hda - Apply AMD controller workaround for Raven platform
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit d2c63b7dfd06788a466d5ec8a850491f084c5fc2 upstream.
+
+It's reported that the garbled sound on HP Envy x360 13z-ag000 (Ryzen
+Laptop) is fixed by the same workaround applied to other AMD chips.
+Update the driver_data entry for Raven (1022:15e3) to use the newly
+introduced preset, AZX_DCAPS_PRESET_AMD_SB.  Since it already contains
+AZX_DCAPS_PM_RUNTIME, we can drop that bit, too.
+
+Reported-and-tested-by: Dennis Padiernos <depadiernos@gmail.com>
+Cc: <stable@vger.kernel.org>
+Link: https://lore.kernel.org/r/20190920073040.31764-1-tiwai@suse.de
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/hda_intel.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -2360,8 +2360,7 @@ static const struct pci_device_id azx_id
+                        AZX_DCAPS_PM_RUNTIME },
+       /* AMD Raven */
+       { PCI_DEVICE(0x1022, 0x15e3),
+-        .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB |
+-                       AZX_DCAPS_PM_RUNTIME },
++        .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
+       /* ATI HDMI */
+       { PCI_DEVICE(0x1002, 0x0002),
+         .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },

diff --git a/queue-4.9/series b/queue-4.9/series
index 5c4e3e374ac8b5eb7826747434c190c9d025b8e8..12aaac31accf30aebda76e396140444e61574e82 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -7,3 +7,5 @@ mtd-cfi_cmdset_0002-use-chip_good-to-retry-in-do_write_oneword.patch
 crypto-talitos-fix-missing-break-in-switch-statement.patch
 media-tvp5150-fix-switch-exit-in-set-control-handler.patch
 asoc-fsl-fix-of-node-refcount-unbalance-in-fsl_ssi_probe_from_dt.patch
+alsa-hda-add-laptop-imic-fixup-for-asus-m9v-laptop.patch
+alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch