From: Greg Kroah-Hartman Date: Wed, 12 May 2021 10:07:25 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v5.4.119~61 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9798e541591d7b72288e82a9e4dd590e64b0951c;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: alsa-hda-realtek-re-order-alc269-sony-quirk-table-entries.patch alsa-hda-realtek-re-order-alc882-acer-quirk-table-entries.patch alsa-hda-realtek-re-order-alc882-sony-quirk-table-entries.patch alsa-hda-realtek-remove-redundant-entry-for-alc861-haier-uniwill-devices.patch --- diff --git a/queue-4.4/alsa-hda-realtek-re-order-alc269-sony-quirk-table-entries.patch b/queue-4.4/alsa-hda-realtek-re-order-alc269-sony-quirk-table-entries.patch new file mode 100644 index 00000000000..82c38df6da2 --- /dev/null +++ b/queue-4.4/alsa-hda-realtek-re-order-alc269-sony-quirk-table-entries.patch @@ -0,0 +1,40 @@ +From cab561f8d4bc9b196ae20c960aa5da89fd786ab5 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Wed, 28 Apr 2021 13:26:59 +0200 +Subject: ALSA: hda/realtek: Re-order ALC269 Sony quirk table entries + +From: Takashi Iwai + +commit cab561f8d4bc9b196ae20c960aa5da89fd786ab5 upstream. + +Just re-order the alc269_fixup_tbl[] entries for Sony devices for +avoiding the oversight of the duplicated or unapplied item in future. +No functional changes. + +Also Cc-to-stable for the further patch applications. + +Cc: +Link: https://lore.kernel.org/r/20210428112704.23967-9-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -5764,12 +5764,12 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x1043, 0x8398, "ASUS P1005", ALC269_FIXUP_STEREO_DMIC), + SND_PCI_QUIRK(0x1043, 0x83ce, "ASUS P1005", ALC269_FIXUP_STEREO_DMIC), + SND_PCI_QUIRK(0x1043, 0x8516, "ASUS X101CH", ALC269_FIXUP_ASUS_X101), +- SND_PCI_QUIRK(0x104d, 0x90b5, "Sony VAIO Pro 11", ALC286_FIXUP_SONY_MIC_NO_PRESENCE), +- SND_PCI_QUIRK(0x104d, 0x90b6, "Sony VAIO Pro 13", ALC286_FIXUP_SONY_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x104d, 0x9073, "Sony VAIO", ALC275_FIXUP_SONY_VAIO_GPIO2), + SND_PCI_QUIRK(0x104d, 0x907b, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ), + SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ), + SND_PCI_QUIRK(0x104d, 0x9099, "Sony VAIO S13", ALC275_FIXUP_SONY_DISABLE_AAMIX), ++ SND_PCI_QUIRK(0x104d, 0x90b5, "Sony VAIO Pro 11", ALC286_FIXUP_SONY_MIC_NO_PRESENCE), ++ SND_PCI_QUIRK(0x104d, 0x90b6, "Sony VAIO Pro 13", ALC286_FIXUP_SONY_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook", ALC269_FIXUP_LIFEBOOK), + SND_PCI_QUIRK(0x10cf, 0x159f, "Lifebook E780", ALC269_FIXUP_LIFEBOOK_NO_HP_TO_LINEOUT), + SND_PCI_QUIRK(0x10cf, 0x15dc, "Lifebook T731", ALC269_FIXUP_LIFEBOOK_HP_PIN), diff --git a/queue-4.4/alsa-hda-realtek-re-order-alc882-acer-quirk-table-entries.patch b/queue-4.4/alsa-hda-realtek-re-order-alc882-acer-quirk-table-entries.patch new file mode 100644 index 00000000000..716722655ae --- /dev/null +++ b/queue-4.4/alsa-hda-realtek-re-order-alc882-acer-quirk-table-entries.patch @@ -0,0 +1,42 @@ +From b265047ac56bad8c4f3d0c8bf9cb4e828ee0d28e Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Wed, 28 Apr 2021 13:26:52 +0200 +Subject: ALSA: hda/realtek: Re-order ALC882 Acer quirk table entries + +From: Takashi Iwai + +commit b265047ac56bad8c4f3d0c8bf9cb4e828ee0d28e upstream. + +Just re-order the alc882_fixup_tbl[] entries for Acer devices for +avoiding the oversight of the duplicated or unapplied item in future. +No functional changes. + +Also Cc-to-stable for the further patch applications. + +Cc: +Link: https://lore.kernel.org/r/20210428112704.23967-2-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -2226,13 +2226,13 @@ static const struct snd_pci_quirk alc882 + ALC882_FIXUP_ACER_ASPIRE_8930G), + SND_PCI_QUIRK(0x1025, 0x0146, "Acer Aspire 6935G", + ALC882_FIXUP_ACER_ASPIRE_8930G), ++ SND_PCI_QUIRK(0x1025, 0x0142, "Acer Aspire 7730G", ++ ALC882_FIXUP_ACER_ASPIRE_4930G), ++ SND_PCI_QUIRK(0x1025, 0x0155, "Packard-Bell M5120", ALC882_FIXUP_PB_M5210), + SND_PCI_QUIRK(0x1025, 0x015e, "Acer Aspire 6930G", + ALC882_FIXUP_ACER_ASPIRE_4930G), + SND_PCI_QUIRK(0x1025, 0x0166, "Acer Aspire 6530G", + ALC882_FIXUP_ACER_ASPIRE_4930G), +- SND_PCI_QUIRK(0x1025, 0x0142, "Acer Aspire 7730G", +- ALC882_FIXUP_ACER_ASPIRE_4930G), +- SND_PCI_QUIRK(0x1025, 0x0155, "Packard-Bell M5120", ALC882_FIXUP_PB_M5210), + SND_PCI_QUIRK(0x1025, 0x021e, "Acer Aspire 5739G", + ALC882_FIXUP_ACER_ASPIRE_4930G), + SND_PCI_QUIRK(0x1025, 0x0259, "Acer Aspire 5935", ALC889_FIXUP_DAC_ROUTE), diff --git a/queue-4.4/alsa-hda-realtek-re-order-alc882-sony-quirk-table-entries.patch b/queue-4.4/alsa-hda-realtek-re-order-alc882-sony-quirk-table-entries.patch new file mode 100644 index 00000000000..b6f01980a08 --- /dev/null +++ b/queue-4.4/alsa-hda-realtek-re-order-alc882-sony-quirk-table-entries.patch @@ -0,0 +1,39 @@ +From b7529c18feecb1af92f9db08c8e7fe446a82d96d Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Wed, 28 Apr 2021 13:26:53 +0200 +Subject: ALSA: hda/realtek: Re-order ALC882 Sony quirk table entries + +From: Takashi Iwai + +commit b7529c18feecb1af92f9db08c8e7fe446a82d96d upstream. + +Just re-order the alc882_fixup_tbl[] entries for Sony devices for +avoiding the oversight of the duplicated or unapplied item in future. +No functional changes. + +Also Cc-to-stable for the further patch applications. + +Cc: +Link: https://lore.kernel.org/r/20210428112704.23967-3-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -2244,11 +2244,11 @@ static const struct snd_pci_quirk alc882 + SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_FIXUP_EEE1601), + SND_PCI_QUIRK(0x1043, 0x84bc, "ASUS ET2700", ALC887_FIXUP_ASUS_BASS), + SND_PCI_QUIRK(0x1043, 0x8691, "ASUS ROG Ranger VIII", ALC882_FIXUP_GPIO3), ++ SND_PCI_QUIRK(0x104d, 0x9043, "Sony Vaio VGC-LN51JGB", ALC882_FIXUP_NO_PRIMARY_HP), ++ SND_PCI_QUIRK(0x104d, 0x9044, "Sony VAIO AiO", ALC882_FIXUP_NO_PRIMARY_HP), + SND_PCI_QUIRK(0x104d, 0x9047, "Sony Vaio TT", ALC889_FIXUP_VAIO_TT), + SND_PCI_QUIRK(0x104d, 0x905a, "Sony Vaio Z", ALC882_FIXUP_NO_PRIMARY_HP), + SND_PCI_QUIRK(0x104d, 0x9060, "Sony Vaio VPCL14M1R", ALC882_FIXUP_NO_PRIMARY_HP), +- SND_PCI_QUIRK(0x104d, 0x9043, "Sony Vaio VGC-LN51JGB", ALC882_FIXUP_NO_PRIMARY_HP), +- SND_PCI_QUIRK(0x104d, 0x9044, "Sony VAIO AiO", ALC882_FIXUP_NO_PRIMARY_HP), + + /* All Apple entries are in codec SSIDs */ + SND_PCI_QUIRK(0x106b, 0x00a0, "MacBookPro 3,1", ALC889_FIXUP_MBP_VREF), diff --git a/queue-4.4/alsa-hda-realtek-remove-redundant-entry-for-alc861-haier-uniwill-devices.patch b/queue-4.4/alsa-hda-realtek-remove-redundant-entry-for-alc861-haier-uniwill-devices.patch new file mode 100644 index 00000000000..9f5093a90cb --- /dev/null +++ b/queue-4.4/alsa-hda-realtek-remove-redundant-entry-for-alc861-haier-uniwill-devices.patch @@ -0,0 +1,36 @@ +From defce244b01ee12534910a4544e11be5eb927d25 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Wed, 28 Apr 2021 13:27:03 +0200 +Subject: ALSA: hda/realtek: Remove redundant entry for ALC861 Haier/Uniwill devices + +From: Takashi Iwai + +commit defce244b01ee12534910a4544e11be5eb927d25 upstream. + +The quirk entry for Uniwill ECS M31EI is with the PCI SSID device 0, +which means matching with all. That is, it's essentially equivalent +with SND_PCI_QUIRK_VENDOR(0x1584), which also matches with the +previous entry for Haier W18 applying the very same quirk. + +Let's unify them with the single vendor-quirk entry. + +Cc: +Link: https://lore.kernel.org/r/20210428112704.23967-13-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -6491,8 +6491,7 @@ static const struct snd_pci_quirk alc861 + SND_PCI_QUIRK(0x1043, 0x1393, "ASUS A6Rp", ALC861_FIXUP_ASUS_A6RP), + SND_PCI_QUIRK_VENDOR(0x1043, "ASUS laptop", ALC861_FIXUP_AMP_VREF_0F), + SND_PCI_QUIRK(0x1462, 0x7254, "HP DX2200", ALC861_FIXUP_NO_JACK_DETECT), +- SND_PCI_QUIRK(0x1584, 0x2b01, "Haier W18", ALC861_FIXUP_AMP_VREF_0F), +- SND_PCI_QUIRK(0x1584, 0x0000, "Uniwill ECS M31EI", ALC861_FIXUP_AMP_VREF_0F), ++ SND_PCI_QUIRK_VENDOR(0x1584, "Haier/Uniwill", ALC861_FIXUP_AMP_VREF_0F), + SND_PCI_QUIRK(0x1734, 0x10c7, "FSC Amilo Pi1505", ALC861_FIXUP_FSC_AMILO_PI1505), + {} + }; diff --git a/queue-4.4/series b/queue-4.4/series index 37cd6138e31..89683c17317 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -68,3 +68,7 @@ mips-reinstate-platform-__div64_32-handler.patch ipw2x00-potential-buffer-overflow-in-libipw_wx_set_encodeext.patch cfg80211-scan-drop-entry-from-hidden_list-on-overflow.patch drm-radeon-fix-copy-of-uninitialized-variable-back-to-userspace.patch +alsa-hda-realtek-re-order-alc882-acer-quirk-table-entries.patch +alsa-hda-realtek-re-order-alc882-sony-quirk-table-entries.patch +alsa-hda-realtek-re-order-alc269-sony-quirk-table-entries.patch +alsa-hda-realtek-remove-redundant-entry-for-alc861-haier-uniwill-devices.patch