From: Greg Kroah-Hartman Date: Tue, 18 Jan 2022 09:47:09 +0000 (+0100) Subject: 5.15-stable patches X-Git-Tag: v5.16.2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c92eaab96bac24c62aa2dca5dda8908c6523f5de;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: alsa-hda-realtek-add-quirk-for-legion-y9000x-2020.patch alsa-hda-realtek-re-order-quirk-entries-for-lenovo.patch --- diff --git a/queue-5.15/alsa-hda-realtek-add-quirk-for-legion-y9000x-2020.patch b/queue-5.15/alsa-hda-realtek-add-quirk-for-legion-y9000x-2020.patch new file mode 100644 index 00000000000..bf7f4b432b5 --- /dev/null +++ b/queue-5.15/alsa-hda-realtek-add-quirk-for-legion-y9000x-2020.patch @@ -0,0 +1,62 @@ +From 8f4c90427a8f0ca0fcdd89d8966fcdab35fb2d4c Mon Sep 17 00:00:00 2001 +From: Baole Fang +Date: Wed, 5 Jan 2022 22:08:54 +0800 +Subject: ALSA: hda/realtek: Add quirk for Legion Y9000X 2020 + +From: Baole Fang + +commit 8f4c90427a8f0ca0fcdd89d8966fcdab35fb2d4c upstream. + +Legion Y9000X 2020 has a speaker, but the speaker doesn't work. +This can be fixed by applying alc285_fixup_ideapad_s740_coef +to fix the speaker's coefficients. +Besides, to support the transition between the speaker and the headphone, +alc287_fixup_legion_15imhg05_speakers needs to be run. + +Signed-off-by: Baole Fang +Cc: +Link: https://lore.kernel.org/r/20220105140856.4855-1-fbl718@163.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -6812,6 +6812,8 @@ enum { + ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE, + ALC233_FIXUP_NO_AUDIO_JACK, + ALC256_FIXUP_MIC_NO_PRESENCE_AND_RESUME, ++ ALC285_FIXUP_LEGION_Y9000X_SPEAKERS, ++ ALC285_FIXUP_LEGION_Y9000X_AUTOMUTE, + }; + + static const struct hda_fixup alc269_fixups[] = { +@@ -8408,6 +8410,18 @@ static const struct hda_fixup alc269_fix + .chained = true, + .chain_id = ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF, + }, ++ [ALC285_FIXUP_LEGION_Y9000X_SPEAKERS] = { ++ .type = HDA_FIXUP_FUNC, ++ .v.func = alc285_fixup_ideapad_s740_coef, ++ .chained = true, ++ .chain_id = ALC285_FIXUP_LEGION_Y9000X_AUTOMUTE, ++ }, ++ [ALC285_FIXUP_LEGION_Y9000X_AUTOMUTE] = { ++ .type = HDA_FIXUP_FUNC, ++ .v.func = alc287_fixup_legion_15imhg05_speakers, ++ .chained = true, ++ .chain_id = ALC269_FIXUP_THINKPAD_ACPI, ++ }, + [ALC287_FIXUP_LEGION_15IMHG05_SPEAKERS] = { + .type = HDA_FIXUP_VERBS, + //.v.verbs = legion_15imhg05_coefs, +@@ -8952,6 +8966,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x17aa, 0x31af, "ThinkCentre Station", ALC623_FIXUP_LENOVO_THINKSTATION_P340), + SND_PCI_QUIRK(0x17aa, 0x3818, "Lenovo C940", ALC298_FIXUP_LENOVO_SPK_VOLUME), + SND_PCI_QUIRK(0x17aa, 0x3827, "Ideapad S740", ALC285_FIXUP_IDEAPAD_S740_COEF), ++ SND_PCI_QUIRK(0x17aa, 0x3824, "Legion Y9000X 2020", ALC285_FIXUP_LEGION_Y9000X_SPEAKERS), + SND_PCI_QUIRK(0x17aa, 0x3834, "Lenovo IdeaPad Slim 9i 14ITL5", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS), + SND_PCI_QUIRK(0x17aa, 0x3843, "Yoga 9i", ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP), + SND_PCI_QUIRK(0x17aa, 0x3813, "Legion 7i 15IMHG05", ALC287_FIXUP_LEGION_15IMHG05_SPEAKERS), diff --git a/queue-5.15/alsa-hda-realtek-re-order-quirk-entries-for-lenovo.patch b/queue-5.15/alsa-hda-realtek-re-order-quirk-entries-for-lenovo.patch new file mode 100644 index 00000000000..85a3c022f90 --- /dev/null +++ b/queue-5.15/alsa-hda-realtek-re-order-quirk-entries-for-lenovo.patch @@ -0,0 +1,45 @@ +From 2aac550da3257ab46e8c7944365eb4a79ccbb3a1 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Wed, 5 Jan 2022 17:03:21 +0100 +Subject: ALSA: hda/realtek: Re-order quirk entries for Lenovo + +From: Takashi Iwai + +commit 2aac550da3257ab46e8c7944365eb4a79ccbb3a1 upstream. + +The recent few quirk entries for Lenovo haven't been put in the right +order. Let's arrange the table again. + +Fixes: ad7cc2d41b7a ("ALSA: hda/realtek: Quirks to enable speaker output...") +Fixes: 6dc86976220c ("ALSA: hda/realtek: Add speaker fixup for some Yoga 15ITL5 devices") +Fixes: 8f4c90427a8f ("ALSA: hda/realtek: Add quirk for Legion Y9000X 2020") +Cc: +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -8964,16 +8964,16 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x17aa, 0x3176, "ThinkCentre Station", ALC283_FIXUP_HEADSET_MIC), + SND_PCI_QUIRK(0x17aa, 0x3178, "ThinkCentre Station", ALC283_FIXUP_HEADSET_MIC), + SND_PCI_QUIRK(0x17aa, 0x31af, "ThinkCentre Station", ALC623_FIXUP_LENOVO_THINKSTATION_P340), ++ SND_PCI_QUIRK(0x17aa, 0x3813, "Legion 7i 15IMHG05", ALC287_FIXUP_LEGION_15IMHG05_SPEAKERS), + SND_PCI_QUIRK(0x17aa, 0x3818, "Lenovo C940", ALC298_FIXUP_LENOVO_SPK_VOLUME), +- SND_PCI_QUIRK(0x17aa, 0x3827, "Ideapad S740", ALC285_FIXUP_IDEAPAD_S740_COEF), ++ SND_PCI_QUIRK(0x17aa, 0x3819, "Lenovo 13s Gen2 ITL", ALC287_FIXUP_13S_GEN2_SPEAKERS), + SND_PCI_QUIRK(0x17aa, 0x3824, "Legion Y9000X 2020", ALC285_FIXUP_LEGION_Y9000X_SPEAKERS), ++ SND_PCI_QUIRK(0x17aa, 0x3827, "Ideapad S740", ALC285_FIXUP_IDEAPAD_S740_COEF), + SND_PCI_QUIRK(0x17aa, 0x3834, "Lenovo IdeaPad Slim 9i 14ITL5", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS), + SND_PCI_QUIRK(0x17aa, 0x3843, "Yoga 9i", ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP), +- SND_PCI_QUIRK(0x17aa, 0x3813, "Legion 7i 15IMHG05", ALC287_FIXUP_LEGION_15IMHG05_SPEAKERS), ++ SND_PCI_QUIRK(0x17aa, 0x384a, "Lenovo Yoga 7 15ITL5", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS), + SND_PCI_QUIRK(0x17aa, 0x3852, "Lenovo Yoga 7 14ITL5", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS), + SND_PCI_QUIRK(0x17aa, 0x3853, "Lenovo Yoga 7 15ITL5", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS), +- SND_PCI_QUIRK(0x17aa, 0x384a, "Lenovo Yoga 7 15ITL5", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS), +- SND_PCI_QUIRK(0x17aa, 0x3819, "Lenovo 13s Gen2 ITL", ALC287_FIXUP_13S_GEN2_SPEAKERS), + SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI), + SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC), + SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo B50-70", ALC269_FIXUP_DMIC_THINKPAD_ACPI), diff --git a/queue-5.15/series b/queue-5.15/series index 7c6d0e9b835..e8d6c9acf05 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -23,3 +23,5 @@ alsa-hda-realtek-use-alc285_fixup_hp_gpio_led-on-another-hp-laptop.patch alsa-hda-realtek-fix-silent-output-on-gigabyte-x570-aorus-master-after-reboot-from-windows.patch alsa-hda-alc287-add-lenovo-ideapad-slim-9i-14itl5-speaker-quirk.patch alsa-hda-tegra-fix-tegra194-hda-reset-failure.patch +alsa-hda-realtek-add-quirk-for-legion-y9000x-2020.patch +alsa-hda-realtek-re-order-quirk-entries-for-lenovo.patch