FAILED: Patch "ALSA: hda/realtek: Fix headset mic on TUXEDO Gemini 17 Gen3" failed to apply to v6.1-stable tree
The patch below does not apply to the v6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
Thanks, Sasha
------------------ original commit in Linus's tree ------------------
From 0b04fbe886b4274c8e5855011233aaa69fec6e75 Mon Sep 17 00:00:00 2001 From: Christoffer Sandberg cs@tuxedo.de Date: Tue, 29 Oct 2024 16:16:52 +0100 Subject: [PATCH] ALSA: hda/realtek: Fix headset mic on TUXEDO Gemini 17 Gen3
Quirk is needed to enable headset microphone on missing pin 0x19.
Signed-off-by: Christoffer Sandberg cs@tuxedo.de Signed-off-by: Werner Sembach wse@tuxedocomputers.com Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20241029151653.80726-1-wse@tuxedocomputers.com Signed-off-by: Takashi Iwai tiwai@suse.de --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 7f4926194e50f..e06a6fdc0bab7 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -10750,6 +10750,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1558, 0x1404, "Clevo N150CU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x14a1, "Clevo L141MU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x2624, "Clevo L240TU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1558, 0x28c1, "Clevo V370VND", ALC2XX_FIXUP_HEADSET_MIC), SND_PCI_QUIRK(0x1558, 0x4018, "Clevo NV40M[BE]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x4019, "Clevo NV40MZ", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x4020, "Clevo NV40MB", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
Hi,
Am 06.11.24 um 03:11 schrieb Sasha Levin:
The patch below does not apply to the v6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
Applying 33affa7fb46c0c07f6c49d4ddac9dd436715064c (ALSA: hda/realtek: Add quirks for some Clevo laptops) first and then 0b04fbe886b4274c8e5855011233aaa69fec6e75 (ALSA: hda/realtek: Fix headset mic on TUXEDO Gemini 17 Gen3) and e49370d769e71456db3fbd982e95bab8c69f73e8 (ALSA: hda/realtek: Fix headset mic on TUXEDO Stellaris 16 Gen6 mb1) makes everything work without alteration.
The first one is just missing the cc stable tag, probably by accident.
Should I alter the 2nd and 3rd commit or should I send a patchset that includes the first one?
Kind regards,
Werner Sembach
Thanks, Sasha
------------------ original commit in Linus's tree ------------------
From 0b04fbe886b4274c8e5855011233aaa69fec6e75 Mon Sep 17 00:00:00 2001 From: Christoffer Sandberg cs@tuxedo.de Date: Tue, 29 Oct 2024 16:16:52 +0100 Subject: [PATCH] ALSA: hda/realtek: Fix headset mic on TUXEDO Gemini 17 Gen3
Quirk is needed to enable headset microphone on missing pin 0x19.
Signed-off-by: Christoffer Sandberg cs@tuxedo.de Signed-off-by: Werner Sembach wse@tuxedocomputers.com Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20241029151653.80726-1-wse@tuxedocomputers.com Signed-off-by: Takashi Iwai tiwai@suse.de
sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 7f4926194e50f..e06a6fdc0bab7 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -10750,6 +10750,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1558, 0x1404, "Clevo N150CU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x14a1, "Clevo L141MU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x2624, "Clevo L240TU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
- SND_PCI_QUIRK(0x1558, 0x28c1, "Clevo V370VND", ALC2XX_FIXUP_HEADSET_MIC), SND_PCI_QUIRK(0x1558, 0x4018, "Clevo NV40M[BE]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x4019, "Clevo NV40MZ", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x4020, "Clevo NV40MB", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
Am 06.11.24 um 10:19 schrieb Werner Sembach:
Hi,
Am 06.11.24 um 03:11 schrieb Sasha Levin:
The patch below does not apply to the v6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
Applying 33affa7fb46c0c07f6c49d4ddac9dd436715064c (ALSA: hda/realtek: Add quirks for some Clevo laptops) first and then 0b04fbe886b4274c8e5855011233aaa69fec6e75 (ALSA: hda/realtek: Fix headset mic on TUXEDO Gemini 17 Gen3) and e49370d769e71456db3fbd982e95bab8c69f73e8 (ALSA: hda/realtek: Fix headset mic on TUXEDO Stellaris 16 Gen6 mb1) makes everything work without alteration.
The first one is just missing the cc stable tag, probably by accident.
Should I alter the 2nd and 3rd commit or should I send a patchset that includes the first one?
Sorry just realized that for 5.15 it's a different patch that is missing for e49370d769e71456db3fbd982e95bab8c69f73e8 to cleanly apply
I will just alter the patches
Kind regards,
Werner Sembach
Thanks, Sasha
------------------ original commit in Linus's tree ------------------
From 0b04fbe886b4274c8e5855011233aaa69fec6e75 Mon Sep 17 00:00:00 2001 From: Christoffer Sandberg cs@tuxedo.de Date: Tue, 29 Oct 2024 16:16:52 +0100 Subject: [PATCH] ALSA: hda/realtek: Fix headset mic on TUXEDO Gemini 17 Gen3
Quirk is needed to enable headset microphone on missing pin 0x19.
Signed-off-by: Christoffer Sandberg cs@tuxedo.de Signed-off-by: Werner Sembach wse@tuxedocomputers.com Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20241029151653.80726-1-wse@tuxedocomputers.com Signed-off-by: Takashi Iwai tiwai@suse.de
sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 7f4926194e50f..e06a6fdc0bab7 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -10750,6 +10750,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1558, 0x1404, "Clevo N150CU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x14a1, "Clevo L141MU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x2624, "Clevo L240TU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1558, 0x28c1, "Clevo V370VND", ALC2XX_FIXUP_HEADSET_MIC), SND_PCI_QUIRK(0x1558, 0x4018, "Clevo NV40M[BE]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x4019, "Clevo NV40MZ", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x4020, "Clevo NV40MB", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
On Wed, Nov 06, 2024 at 10:23:14AM +0100, Werner Sembach wrote:
Am 06.11.24 um 10:19 schrieb Werner Sembach:
Hi,
Am 06.11.24 um 03:11 schrieb Sasha Levin:
The patch below does not apply to the v6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
Applying 33affa7fb46c0c07f6c49d4ddac9dd436715064c (ALSA: hda/realtek: Add quirks for some Clevo laptops) first and then 0b04fbe886b4274c8e5855011233aaa69fec6e75 (ALSA: hda/realtek: Fix headset mic on TUXEDO Gemini 17 Gen3) and e49370d769e71456db3fbd982e95bab8c69f73e8 (ALSA: hda/realtek: Fix headset mic on TUXEDO Stellaris 16 Gen6 mb1) makes everything work without alteration.
The first one is just missing the cc stable tag, probably by accident.
Should I alter the 2nd and 3rd commit or should I send a patchset that includes the first one?
Sorry just realized that for 5.15 it's a different patch that is missing for e49370d769e71456db3fbd982e95bab8c69f73e8 to cleanly apply
I will just alter the patches
It applies, but fails to build:
In file included from sound/pci/hda/patch_realtek.c:21: sound/pci/hda/patch_realtek.c:9530:59: error: 'ALC2XX_FIXUP_HEADSET_MIC' undeclared here (not in a function); did you mean 'ALC283_FIXUP_HEADSET_MIC'? 9530 | SND_PCI_QUIRK(0x1d05, 0x1387, "TongFang GMxIXxx", ALC2XX_FIXUP_HEADSET_MIC), | ^~~~~~~~~~~~~~~~~~~~~~~~ ./include/sound/core.h:465:50: note: in definition of macro 'SND_PCI_QUIRK' 465 | {_SND_PCI_QUIRK_ID(vend, dev), .value = (val), .name = (xname)} | ^~~ make[3]: *** [scripts/Makefile.build:289: sound/pci/hda/patch_realtek.o] Error 1
Hi,
Am 06.11.24 um 13:00 schrieb Sasha Levin:
On Wed, Nov 06, 2024 at 10:23:14AM +0100, Werner Sembach wrote:
Am 06.11.24 um 10:19 schrieb Werner Sembach:
Hi,
Am 06.11.24 um 03:11 schrieb Sasha Levin:
The patch below does not apply to the v6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
Applying 33affa7fb46c0c07f6c49d4ddac9dd436715064c (ALSA: hda/realtek: Add quirks for some Clevo laptops) first and then 0b04fbe886b4274c8e5855011233aaa69fec6e75 (ALSA: hda/realtek: Fix headset mic on TUXEDO Gemini 17 Gen3) and e49370d769e71456db3fbd982e95bab8c69f73e8 (ALSA: hda/realtek: Fix headset mic on TUXEDO Stellaris 16 Gen6 mb1) makes everything work without alteration.
The first one is just missing the cc stable tag, probably by accident.
Should I alter the 2nd and 3rd commit or should I send a patchset that includes the first one?
Sorry just realized that for 5.15 it's a different patch that is missing for e49370d769e71456db3fbd982e95bab8c69f73e8 to cleanly apply
I will just alter the patches
It applies, but fails to build:
In file included from sound/pci/hda/patch_realtek.c:21: sound/pci/hda/patch_realtek.c:9530:59: error: 'ALC2XX_FIXUP_HEADSET_MIC' undeclared here (not in a function); did you mean 'ALC283_FIXUP_HEADSET_MIC'? 9530 | SND_PCI_QUIRK(0x1d05, 0x1387, "TongFang GMxIXxx", ALC2XX_FIXUP_HEADSET_MIC), | ^~~~~~~~~~~~~~~~~~~~~~~~ ./include/sound/core.h:465:50: note: in definition of macro 'SND_PCI_QUIRK' 465 | {_SND_PCI_QUIRK_ID(vend, dev), .value = (val), .name = (xname)} | ^~~ make[3]: *** [scripts/Makefile.build:289: sound/pci/hda/patch_realtek.o] Error 1
I'm sorry I did not double check if the define exists ins 6.1.
Considering that it's a fairly new device it's reasonable enough to assume that it's probably not run with the 6.1 kernel and so I don't want to blow up the patch to much. So just forget about it and sorry again that I caused you extra work.
Kind regards,
Werner Sembach
linux-stable-mirror@lists.linaro.org
-
Sasha Levin -
Werner Sembach