Skip to content

Commit 46cdff2

Browse files
KailangYangtiwai
authored andcommitted
ALSA: hda/realtek - Remodified 3k pull low procedure
Set spec->en_3kpull_low default to true. Then fillback ALC236 and ALC257 to false. Additional note: this addresses a regression caused by the previous fix 69ea4c9 ("ALSA: hda/realtek - remove 3k pull low procedure"). The previous workaround was applied too widely without necessity, which resulted in the pop noise at PM again. This patch corrects the condition and restores the old behavior for the devices that don't suffer from the original problem. Fixes: 69ea4c9 ("ALSA: hda/realtek - remove 3k pull low procedure") Link: https://bugzilla.kernel.org/show_bug.cgi?id=217732 Link: https://lore.kernel.org/r/01e212a538fc407ca6edd10b81ff7b05@realtek.com Signed-off-by: Kailang Yang <kailang@realtek.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent 220c8f6 commit 46cdff2

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

sound/pci/hda/patch_realtek.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10643,6 +10643,7 @@ static int patch_alc269(struct hda_codec *codec)
1064310643
spec = codec->spec;
1064410644
spec->gen.shared_mic_vref_pin = 0x18;
1064510645
codec->power_save_node = 0;
10646+
spec->en_3kpull_low = true;
1064610647

1064710648
#ifdef CONFIG_PM
1064810649
codec->patch_ops.suspend = alc269_suspend;
@@ -10725,14 +10726,16 @@ static int patch_alc269(struct hda_codec *codec)
1072510726
spec->shutup = alc256_shutup;
1072610727
spec->init_hook = alc256_init;
1072710728
spec->gen.mixer_nid = 0; /* ALC256 does not have any loopback mixer path */
10728-
if (codec->bus->pci->vendor == PCI_VENDOR_ID_AMD)
10729-
spec->en_3kpull_low = true;
10729+
if (codec->core.vendor_id == 0x10ec0236 &&
10730+
codec->bus->pci->vendor != PCI_VENDOR_ID_AMD)
10731+
spec->en_3kpull_low = false;
1073010732
break;
1073110733
case 0x10ec0257:
1073210734
spec->codec_variant = ALC269_TYPE_ALC257;
1073310735
spec->shutup = alc256_shutup;
1073410736
spec->init_hook = alc256_init;
1073510737
spec->gen.mixer_nid = 0;
10738+
spec->en_3kpull_low = false;
1073610739
break;
1073710740
case 0x10ec0215:
1073810741
case 0x10ec0245:

0 commit comments

Comments
 (0)