Attachment 876269 Details for Bug 1228269

[patch] Workaround for noise at shutdown

0001-ALSA-hda-conexant-Mute-speaker-at-shutdown-on-Thinkp.patch (text/plain), 3.96 KB, created by Takashi Iwai on 2024-07-25 14:56:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Takashi Iwai

Created: 2024-07-25 14:56:52 UTC

Size: 3.96 KB

patch

obsolete

>From 6ecf1f7c83a99bda2c4c2b457e0a4886f712d214 Mon Sep 17 00:00:00 2001
>From: Takashi Iwai <tiwai@suse.de>
>Date: Thu, 25 Jul 2024 16:47:30 +0200
>Subject: [PATCH] ALSA: hda: conexant: Mute speaker at shutdown on Thinkpad E16
> Gen2
>Patch-mainline: Not yet, testing
>References: bsc#1228269
>
>It was reported that Lenovo Thinkpad E16 Gen2 shows a click noise at
>shutdown, and turning off the amp seems working around it.
>
>Implement a quirk to forcibly mute the speaker amp on this machine at
>shutdown.
>
>Link: https://bugzilla.suse.com/show_bug.cgi?id=1228269
>Signed-off-by: Takashi Iwai <tiwai@suse.de>
>
>---
> sound/pci/hda/patch_conexant.c | 53 +++++++++++++++++++++++++++++++++-
> 1 file changed, 52 insertions(+), 1 deletion(-)
>
>diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
>index 17389a3801bd..e7192b499da3 100644
>--- a/sound/pci/hda/patch_conexant.c
>+++ b/sound/pci/hda/patch_conexant.c
>@@ -50,6 +50,9 @@ struct conexant_spec {
> 	unsigned int gpio_mic_led_mask;
> 	unsigned int headset_present_flag;
> 	bool is_cx8070_sn6140;
>+
>+	/* hooks */
>+	void (*shutup)(struct hda_codec *codec);
> };
> 
> 
>@@ -208,7 +211,7 @@ static int cx_auto_init(struct hda_codec *codec)
> 	return 0;
> }
> 
>-static void cx_auto_shutdown(struct hda_codec *codec)
>+static void cx_auto_shutup_default(struct hda_codec *codec)
> {
> 	struct conexant_spec *spec = codec->spec;
> 
>@@ -217,6 +220,36 @@ static void cx_auto_shutdown(struct hda_codec *codec)
> 	cx_auto_turn_eapd(codec, spec->num_eapds, spec->eapds, false);
> }
> 
>+static void cx_auto_shutup_mute(struct hda_codec *codec)
>+{
>+	struct conexant_spec *spec = codec->spec;
>+	hda_nid_t nid;
>+	int c;
>+
>+	if (!snd_hdac_is_power_on(&codec->core))
>+		return;
>+
>+	/* forcibly mute the speaker output */
>+	nid = spec->gen.multiout.extra_out_nid[0];
>+	for (c = 0; c < 2; c++) {
>+		if (!(snd_hda_codec_amp_read(codec, nid, c, HDA_OUTPUT, 0) & HDA_AMP_MUTE))
>+			snd_hda_codec_write(codec, nid, 0,
>+					    AC_VERB_SET_AMP_GAIN_MUTE, HDA_AMP_MUTE);
>+	}
>+
>+	cx_auto_shutup_default(codec);
>+}
>+
>+static void cx_auto_shutdown(struct hda_codec *codec)
>+{
>+	struct conexant_spec *spec = codec->spec;
>+
>+	if (spec->shutup)
>+		spec->shutup(codec);
>+	else
>+		cx_auto_shutup_default(codec);
>+}
>+
> static void cx_auto_free(struct hda_codec *codec)
> {
> 	cx_auto_shutdown(codec);
>@@ -341,6 +374,7 @@ enum {
> 	CXT_FIXUP_HEADSET_MIC,
> 	CXT_FIXUP_HP_MIC_NO_PRESENCE,
> 	CXT_PINCFG_SWS_JS201D,
>+	CXT_FIXUP_THINKPAD_SHUTDOWN_MUTE,
> };
> 
> /* for hda_fixup_thinkpad_acpi() */
>@@ -809,6 +843,16 @@ static void cxt_fixup_hp_zbook_mute_led(struct hda_codec *codec,
> 		cxt_setup_mute_led(codec, 0x10, 0x20);
> }
> 
>+static void cxt_fixup_thinkpad_shutdown_mute(struct hda_codec *codec,
>+					     const struct hda_fixup *fix,
>+					     int action)
>+{
>+	struct conexant_spec *spec = codec->spec;
>+
>+	if (action == HDA_FIXUP_ACT_PRE_PROBE)
>+		spec->shutup = cx_auto_shutup_mute;
>+}
>+
> /* ThinkPad X200 & co with cxt5051 */
> static const struct hda_pintbl cxt_pincfg_lenovo_x200[] = {
> 	{ 0x16, 0x042140ff }, /* HP (seq# overridden) */
>@@ -1008,6 +1052,12 @@ static const struct hda_fixup cxt_fixups[] = {
> 		.type = HDA_FIXUP_PINS,
> 		.v.pins = cxt_pincfg_sws_js201d,
> 	},
>+	[CXT_FIXUP_THINKPAD_SHUTDOWN_MUTE] = {
>+		.type = HDA_FIXUP_FUNC,
>+		.v.func = cxt_fixup_thinkpad_shutdown_mute,
>+		.chained = true,
>+		.chain_id = CXT_FIXUP_THINKPAD_ACPI,
>+	},
> };
> 
> static const struct snd_pci_quirk cxt5045_fixups[] = {
>@@ -1101,6 +1151,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {
> 	SND_PCI_QUIRK(0x17aa, 0x3977, "Lenovo IdeaPad U310", CXT_FIXUP_STEREO_DMIC),
> 	SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo G50-70", CXT_FIXUP_STEREO_DMIC),
> 	SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC),
>+	SND_PCI_QUIRK(0x17aa, 0x50ec, "Lenovo ThinkPad E16 Gen 2", CXT_FIXUP_THINKPAD_SHUTDOWN_MUTE),
> 	SND_PCI_QUIRK_VENDOR(0x17aa, "Thinkpad", CXT_FIXUP_THINKPAD_ACPI),
> 	SND_PCI_QUIRK(0x1c06, 0x2011, "Lemote A1004", CXT_PINCFG_LEMOTE_A1004),
> 	SND_PCI_QUIRK(0x1c06, 0x2012, "Lemote A1205", CXT_PINCFG_LEMOTE_A1205),
>-- 
>2.43.0
>

Actions: View | Diff

Attachments on bug 1228269: 876227 | 876228 | 876229 | 876230 | 876231 | 876232 | 876233 | 876239 | 876240 | 876241 | 876269 | 876289