From: Greg Kroah-Hartman Date: Mon, 29 Jun 2020 09:07:20 +0000 (+0200) Subject: 5.7-stable patches X-Git-Tag: v5.7.7~37 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb07fb8902343173a7a98791e7cd3a79c2b9088f;p=thirdparty%2Fkernel%2Fstable-queue.git 5.7-stable patches added patches: alsa-hda-add-nvidia-codec-ids-9a-9d-through-a0-to-patch-table.patch alsa-hda-realtek-add-mute-led-and-micmute-led-support-for-hp-systems.patch alsa-hda-realtek-add-quirk-for-msi-ge63-laptop.patch syscalls-fix-offset-type-of-ksys_ftruncate.patch --- diff --git a/queue-5.7/alsa-hda-add-nvidia-codec-ids-9a-9d-through-a0-to-patch-table.patch b/queue-5.7/alsa-hda-add-nvidia-codec-ids-9a-9d-through-a0-to-patch-table.patch new file mode 100644 index 00000000000..faa9380685e --- /dev/null +++ b/queue-5.7/alsa-hda-add-nvidia-codec-ids-9a-9d-through-a0-to-patch-table.patch @@ -0,0 +1,36 @@ +From adb36a8203831e40494a92095dacd566b2ad4a69 Mon Sep 17 00:00:00 2001 +From: Aaron Plattner +Date: Thu, 11 Jun 2020 11:08:45 -0700 +Subject: ALSA: hda: Add NVIDIA codec IDs 9a & 9d through a0 to patch table + +From: Aaron Plattner + +commit adb36a8203831e40494a92095dacd566b2ad4a69 upstream. + +These IDs are for upcoming NVIDIA chips with audio functions that are largely +similar to the existing ones. + +Signed-off-by: Aaron Plattner +Cc: +Link: https://lore.kernel.org/r/20200611180845.39942-1-aplattner@nvidia.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_hdmi.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/sound/pci/hda/patch_hdmi.c ++++ b/sound/pci/hda/patch_hdmi.c +@@ -4145,6 +4145,11 @@ HDA_CODEC_ENTRY(0x10de0095, "GPU 95 HDMI + HDA_CODEC_ENTRY(0x10de0097, "GPU 97 HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de0098, "GPU 98 HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de0099, "GPU 99 HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de009a, "GPU 9a HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de009d, "GPU 9d HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de009e, "GPU 9e HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de009f, "GPU 9f HDMI/DP", patch_nvhdmi), ++HDA_CODEC_ENTRY(0x10de00a0, "GPU a0 HDMI/DP", patch_nvhdmi), + HDA_CODEC_ENTRY(0x10de8001, "MCP73 HDMI", patch_nvhdmi_2ch), + HDA_CODEC_ENTRY(0x10de8067, "MCP67/68 HDMI", patch_nvhdmi_2ch), + HDA_CODEC_ENTRY(0x11069f80, "VX900 HDMI/DP", patch_via_hdmi), diff --git a/queue-5.7/alsa-hda-realtek-add-mute-led-and-micmute-led-support-for-hp-systems.patch b/queue-5.7/alsa-hda-realtek-add-mute-led-and-micmute-led-support-for-hp-systems.patch new file mode 100644 index 00000000000..3008ac263ed --- /dev/null +++ b/queue-5.7/alsa-hda-realtek-add-mute-led-and-micmute-led-support-for-hp-systems.patch @@ -0,0 +1,35 @@ +From b2c22910fe5aae10b7e17b0721e63a3edf0c9553 Mon Sep 17 00:00:00 2001 +From: Kai-Heng Feng +Date: Wed, 17 Jun 2020 18:29:02 +0800 +Subject: ALSA: hda/realtek: Add mute LED and micmute LED support for HP systems + +From: Kai-Heng Feng + +commit b2c22910fe5aae10b7e17b0721e63a3edf0c9553 upstream. + +There are two more HP systems control mute LED from HDA codec and need +to expose micmute led class so SoF can control micmute LED. + +Add quirks to support them. + +Signed-off-by: Kai-Heng Feng +Cc: +Link: https://lore.kernel.org/r/20200617102906.16156-2-kai.heng.feng@canonical.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_realtek.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -7436,6 +7436,8 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x103c, 0x83b9, "HP Spectre x360", ALC269_FIXUP_HP_MUTE_LED_MIC3), + SND_PCI_QUIRK(0x103c, 0x8497, "HP Envy x360", ALC269_FIXUP_HP_MUTE_LED_MIC3), + SND_PCI_QUIRK(0x103c, 0x84e7, "HP Pavilion 15", ALC269_FIXUP_HP_MUTE_LED_MIC3), ++ SND_PCI_QUIRK(0x103c, 0x869d, "HP", ALC236_FIXUP_HP_MUTE_LED), ++ SND_PCI_QUIRK(0x103c, 0x8729, "HP", ALC285_FIXUP_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x8736, "HP", ALC285_FIXUP_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x877a, "HP", ALC285_FIXUP_HP_MUTE_LED), + SND_PCI_QUIRK(0x103c, 0x877d, "HP", ALC236_FIXUP_HP_MUTE_LED), diff --git a/queue-5.7/alsa-hda-realtek-add-quirk-for-msi-ge63-laptop.patch b/queue-5.7/alsa-hda-realtek-add-quirk-for-msi-ge63-laptop.patch new file mode 100644 index 00000000000..668ce9e98f8 --- /dev/null +++ b/queue-5.7/alsa-hda-realtek-add-quirk-for-msi-ge63-laptop.patch @@ -0,0 +1,33 @@ +From a0b03952a797591d4b6d6fa7b9b7872e27783729 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Tue, 16 Jun 2020 15:21:50 +0200 +Subject: ALSA: hda/realtek - Add quirk for MSI GE63 laptop + +From: Takashi Iwai + +commit a0b03952a797591d4b6d6fa7b9b7872e27783729 upstream. + +MSI GE63 laptop with ALC1220 codec requires the very same quirk +(ALC1220_FIXUP_CLEVO_P950) as other MSI devices for the proper sound +output. + +BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=208057 +Cc: +Link: https://lore.kernel.org/r/20200616132150.8778-1-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -2460,6 +2460,7 @@ static const struct snd_pci_quirk alc882 + SND_PCI_QUIRK(0x1458, 0xa0b8, "Gigabyte AZ370-Gaming", ALC1220_FIXUP_GB_DUAL_CODECS), + SND_PCI_QUIRK(0x1458, 0xa0cd, "Gigabyte X570 Aorus Master", ALC1220_FIXUP_CLEVO_P950), + SND_PCI_QUIRK(0x1458, 0xa0ce, "Gigabyte X570 Aorus Xtreme", ALC1220_FIXUP_CLEVO_P950), ++ SND_PCI_QUIRK(0x1462, 0x11f7, "MSI-GE63", ALC1220_FIXUP_CLEVO_P950), + SND_PCI_QUIRK(0x1462, 0x1228, "MSI-GP63", ALC1220_FIXUP_CLEVO_P950), + SND_PCI_QUIRK(0x1462, 0x1275, "MSI-GL63", ALC1220_FIXUP_CLEVO_P950), + SND_PCI_QUIRK(0x1462, 0x1276, "MSI-GL73", ALC1220_FIXUP_CLEVO_P950), diff --git a/queue-5.7/series b/queue-5.7/series index 55ab583a5c1..b47127f3e0f 100644 --- a/queue-5.7/series +++ b/queue-5.7/series @@ -205,3 +205,7 @@ blktrace-break-out-of-blktrace-setup-on-concurrent-c.patch nvdimm-region-always-show-the-align-attribute.patch block-update-hctx-map-when-use-multiple-maps.patch risc-v-don-t-allow-write-exec-only-page-mapping-requ.patch +syscalls-fix-offset-type-of-ksys_ftruncate.patch +alsa-hda-add-nvidia-codec-ids-9a-9d-through-a0-to-patch-table.patch +alsa-hda-realtek-add-quirk-for-msi-ge63-laptop.patch +alsa-hda-realtek-add-mute-led-and-micmute-led-support-for-hp-systems.patch diff --git a/queue-5.7/syscalls-fix-offset-type-of-ksys_ftruncate.patch b/queue-5.7/syscalls-fix-offset-type-of-ksys_ftruncate.patch new file mode 100644 index 00000000000..f80d005844c --- /dev/null +++ b/queue-5.7/syscalls-fix-offset-type-of-ksys_ftruncate.patch @@ -0,0 +1,38 @@ +From 8e742aa79780b13cd300a42198c1a4cea9c89905 Mon Sep 17 00:00:00 2001 +From: Jiri Slaby +Date: Wed, 10 Jun 2020 13:48:51 +0200 +Subject: syscalls: Fix offset type of ksys_ftruncate() + +From: Jiri Slaby + +commit 8e742aa79780b13cd300a42198c1a4cea9c89905 upstream. + +After the commit below, truncate() on x86 32bit uses ksys_ftruncate(). But +ksys_ftruncate() truncates the offset to unsigned long. + +Switch the type of offset to loff_t which is what do_sys_ftruncate() +expects. + +Fixes: 121b32a58a3a (x86/entry/32: Use IA32-specific wrappers for syscalls taking 64-bit arguments) +Signed-off-by: Jiri Slaby +Signed-off-by: Thomas Gleixner +Reviewed-by: Brian Gerst +Cc: stable@vger.kernel.org +Link: https://lkml.kernel.org/r/20200610114851.28549-1-jslaby@suse.cz +Signed-off-by: Greg Kroah-Hartman + +--- + include/linux/syscalls.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/include/linux/syscalls.h ++++ b/include/linux/syscalls.h +@@ -1358,7 +1358,7 @@ static inline long ksys_lchown(const cha + + extern long do_sys_ftruncate(unsigned int fd, loff_t length, int small); + +-static inline long ksys_ftruncate(unsigned int fd, unsigned long length) ++static inline long ksys_ftruncate(unsigned int fd, loff_t length) + { + return do_sys_ftruncate(fd, length, 1); + }