From 5542381c38199f29c063b9c90b04be19e15ed519 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 25 Sep 2019 07:10:57 +0200 Subject: [PATCH] drop broken alsa patch for 4.4 and 4.9 --- ...roller-workaround-for-raven-platform.patch | 37 ------------------- queue-4.4/series | 1 - ...roller-workaround-for-raven-platform.patch | 37 ------------------- queue-4.9/series | 1 - 4 files changed, 76 deletions(-) delete mode 100644 queue-4.4/alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch delete mode 100644 queue-4.9/alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch diff --git a/queue-4.4/alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch b/queue-4.4/alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch deleted file mode 100644 index f817bb20b73..00000000000 --- a/queue-4.4/alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d2c63b7dfd06788a466d5ec8a850491f084c5fc2 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Fri, 20 Sep 2019 09:30:40 +0200 -Subject: ALSA: hda - Apply AMD controller workaround for Raven platform - -From: Takashi Iwai - -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 -Cc: -Link: https://lore.kernel.org/r/20190920073040.31764-1-tiwai@suse.de -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman - ---- - 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 -@@ -2371,8 +2371,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.4/series b/queue-4.4/series index 99957fecdbf..44dcadec375 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -8,4 +8,3 @@ crypto-talitos-fix-missing-break-in-switch-statement.patch net-rds-fix-null-ptr-use-in-rds_tcp_kill_sock.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 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 deleted file mode 100644 index 64d06dd7cde..00000000000 --- a/queue-4.9/alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d2c63b7dfd06788a466d5ec8a850491f084c5fc2 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Fri, 20 Sep 2019 09:30:40 +0200 -Subject: ALSA: hda - Apply AMD controller workaround for Raven platform - -From: Takashi Iwai - -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 -Cc: -Link: https://lore.kernel.org/r/20190920073040.31764-1-tiwai@suse.de -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman - ---- - 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 12aaac31acc..d4c44d55ee6 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -8,4 +8,3 @@ 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 -- 2.47.3