From 4d897e213ae512f85c5d88c8e37639d0824eef56 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 25 Sep 2019 07:06:03 +0200 Subject: [PATCH] 4.19-stable patches added patches: alsa-dice-fix-wrong-packet-parameter-for-alesis-io26.patch alsa-hda-add-laptop-imic-fixup-for-asus-m9v-laptop.patch alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch alsa-usb-audio-add-dsd-support-for-evga-nu-audio.patch alsa-usb-audio-add-hiby-device-family-to-quirks-for-native-dsd-support.patch --- ...ong-packet-parameter-for-alesis-io26.patch | 46 +++++++++++++++++++ ...aptop-imic-fixup-for-asus-m9v-laptop.patch | 32 +++++++++++++ ...roller-workaround-for-raven-platform.patch | 37 +++++++++++++++ ...io-add-dsd-support-for-evga-nu-audio.patch | 32 +++++++++++++ ...ily-to-quirks-for-native-dsd-support.patch | 32 +++++++++++++ queue-4.19/series | 5 ++ 6 files changed, 184 insertions(+) create mode 100644 queue-4.19/alsa-dice-fix-wrong-packet-parameter-for-alesis-io26.patch create mode 100644 queue-4.19/alsa-hda-add-laptop-imic-fixup-for-asus-m9v-laptop.patch create mode 100644 queue-4.19/alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch create mode 100644 queue-4.19/alsa-usb-audio-add-dsd-support-for-evga-nu-audio.patch create mode 100644 queue-4.19/alsa-usb-audio-add-hiby-device-family-to-quirks-for-native-dsd-support.patch diff --git a/queue-4.19/alsa-dice-fix-wrong-packet-parameter-for-alesis-io26.patch b/queue-4.19/alsa-dice-fix-wrong-packet-parameter-for-alesis-io26.patch new file mode 100644 index 00000000000..bdb4aed8d3c --- /dev/null +++ b/queue-4.19/alsa-dice-fix-wrong-packet-parameter-for-alesis-io26.patch @@ -0,0 +1,46 @@ +From 3a9236e97207f2469254b4098995159b80174d95 Mon Sep 17 00:00:00 2001 +From: Takashi Sakamoto +Date: Mon, 16 Sep 2019 19:18:51 +0900 +Subject: ALSA: dice: fix wrong packet parameter for Alesis iO26 + +From: Takashi Sakamoto + +commit 3a9236e97207f2469254b4098995159b80174d95 upstream. + +At higher sampling rate (e.g. 192.0 kHz), Alesis iO26 transfers 4 data +channels per data block in CIP. + +Both iO14 and iO26 have the same contents in their configuration ROM. +For this reason, ALSA Dice driver attempts to distinguish them according +to the value of TX0_AUDIO register at probe callback. Although the way is +valid at lower and middle sampling rate, it's lastly invalid at higher +sampling rate because because the two models returns the same value for +read transaction to the register. + +In the most cases, users just plug-in the device and ALSA dice driver +detects it. In the case, the device runs at lower sampling rate and +the driver detects expectedly. For this reason, this commit leaves the +way to detect as is. + +Fixes: 28b208f600a3 ("ALSA: dice: add parameters of stream formats for models produced by Alesis") +Cc: # v4.18+ +Signed-off-by: Takashi Sakamoto +Link: https://lore.kernel.org/r/20190916101851.30409-1-o-takashi@sakamocchi.jp +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/firewire/dice/dice-alesis.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/firewire/dice/dice-alesis.c ++++ b/sound/firewire/dice/dice-alesis.c +@@ -15,7 +15,7 @@ alesis_io14_tx_pcm_chs[MAX_STREAMS][SND_ + + static const unsigned int + alesis_io26_tx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT] = { +- {10, 10, 8}, /* Tx0 = Analog + S/PDIF. */ ++ {10, 10, 4}, /* Tx0 = Analog + S/PDIF. */ + {16, 8, 0}, /* Tx1 = ADAT1 + ADAT2. */ + }; + diff --git a/queue-4.19/alsa-hda-add-laptop-imic-fixup-for-asus-m9v-laptop.patch b/queue-4.19/alsa-hda-add-laptop-imic-fixup-for-asus-m9v-laptop.patch new file mode 100644 index 00000000000..0d300a6bb40 --- /dev/null +++ b/queue-4.19/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)" +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) + +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) +Cc: +Link: https://lore.kernel.org/r/20190920134052.GA8035@localhost +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + 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.19/alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch b/queue-4.19/alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch new file mode 100644 index 00000000000..dcea05a5b47 --- /dev/null +++ b/queue-4.19/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 +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 +@@ -2662,8 +2662,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.19/alsa-usb-audio-add-dsd-support-for-evga-nu-audio.patch b/queue-4.19/alsa-usb-audio-add-dsd-support-for-evga-nu-audio.patch new file mode 100644 index 00000000000..f95ac92e21c --- /dev/null +++ b/queue-4.19/alsa-usb-audio-add-dsd-support-for-evga-nu-audio.patch @@ -0,0 +1,32 @@ +From f41f900568d9ffd896cc941db7021eb14bd55910 Mon Sep 17 00:00:00 2001 +From: Jussi Laako +Date: Tue, 24 Sep 2019 10:11:43 +0300 +Subject: ALSA: usb-audio: Add DSD support for EVGA NU Audio + +From: Jussi Laako + +commit f41f900568d9ffd896cc941db7021eb14bd55910 upstream. + +EVGA NU Audio is actually a USB audio device on a PCIexpress card, +with it's own USB controller. It supports both PCM and DSD. + +Signed-off-by: Jussi Laako +Cc: +Link: https://lore.kernel.org/r/20190924071143.30911-1-jussi@sonarnerd.net +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/usb/quirks.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/usb/quirks.c ++++ b/sound/usb/quirks.c +@@ -1449,6 +1449,7 @@ u64 snd_usb_interface_dsd_format_quirks( + case 0x152a: /* Thesycon devices */ + case 0x25ce: /* Mytek devices */ + case 0x2ab6: /* T+A devices */ ++ case 0x3842: /* EVGA */ + case 0xc502: /* HiBy devices */ + if (fp->dsd_raw) + return SNDRV_PCM_FMTBIT_DSD_U32_BE; diff --git a/queue-4.19/alsa-usb-audio-add-hiby-device-family-to-quirks-for-native-dsd-support.patch b/queue-4.19/alsa-usb-audio-add-hiby-device-family-to-quirks-for-native-dsd-support.patch new file mode 100644 index 00000000000..4c466db69cd --- /dev/null +++ b/queue-4.19/alsa-usb-audio-add-hiby-device-family-to-quirks-for-native-dsd-support.patch @@ -0,0 +1,32 @@ +From 029d2c0fd61eac74700fb4ffff36fc63bfff7e5e Mon Sep 17 00:00:00 2001 +From: Ilya Pshonkin +Date: Tue, 17 Sep 2019 10:49:34 +0300 +Subject: ALSA: usb-audio: Add Hiby device family to quirks for native DSD support + +From: Ilya Pshonkin + +commit 029d2c0fd61eac74700fb4ffff36fc63bfff7e5e upstream. + +This patch adds quirk VID ID for Hiby portable players family with +native DSD playback support. + +Signed-off-by: Ilya Pshonkin +Cc: +Link: https://lore.kernel.org/r/20190917074937.157802-1-ilya.pshonkin@netforce.ua +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/usb/quirks.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/usb/quirks.c ++++ b/sound/usb/quirks.c +@@ -1449,6 +1449,7 @@ u64 snd_usb_interface_dsd_format_quirks( + case 0x152a: /* Thesycon devices */ + case 0x25ce: /* Mytek devices */ + case 0x2ab6: /* T+A devices */ ++ case 0xc502: /* HiBy devices */ + if (fp->dsd_raw) + return SNDRV_PCM_FMTBIT_DSD_U32_BE; + break; diff --git a/queue-4.19/series b/queue-4.19/series index 00819d09b57..43116ca39d6 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -24,3 +24,8 @@ iwlwifi-mvm-always-init-rs_fw-with-20mhz-bandwidth-rates.patch media-tvp5150-fix-switch-exit-in-set-control-handler.patch asoc-intel-cht_bsw_max98090_ti-enable-codec-clock-once-and-keep-it-enabled.patch asoc-fsl-fix-of-node-refcount-unbalance-in-fsl_ssi_probe_from_dt.patch +alsa-usb-audio-add-hiby-device-family-to-quirks-for-native-dsd-support.patch +alsa-usb-audio-add-dsd-support-for-evga-nu-audio.patch +alsa-dice-fix-wrong-packet-parameter-for-alesis-io26.patch +alsa-hda-add-laptop-imic-fixup-for-asus-m9v-laptop.patch +alsa-hda-apply-amd-controller-workaround-for-raven-platform.patch -- 2.47.2