Commit 46cdff23 authored by Kailang Yang's avatar Kailang Yang Committed by Takashi Iwai
Browse files

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 69ea4c9d ("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: 69ea4c9d ("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: default avatarKailang Yang <kailang@realtek.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 220c8f67

sound/pci/hda/patch_realtek.c

+5 −2
Original line number Diff line number Diff line
@@ -10643,6 +10643,7 @@ static int patch_alc269(struct hda_codec *codec) 
	spec = codec->spec;

	spec->gen.shared_mic_vref_pin = 0x18;

	codec->power_save_node = 0;

	spec->en_3kpull_low = true;



#ifdef CONFIG_PM

	codec->patch_ops.suspend = alc269_suspend;
@@ -10725,14 +10726,16 @@ static int patch_alc269(struct hda_codec *codec) 
		spec->shutup = alc256_shutup;

		spec->init_hook = alc256_init;

		spec->gen.mixer_nid = 0; /* ALC256 does not have any loopback mixer path */

		if (codec->bus->pci->vendor == PCI_VENDOR_ID_AMD)

			spec->en_3kpull_low = true;

		if (codec->core.vendor_id == 0x10ec0236 &&

		    codec->bus->pci->vendor != PCI_VENDOR_ID_AMD)

			spec->en_3kpull_low = false;

		break;

	case 0x10ec0257:

		spec->codec_variant = ALC269_TYPE_ALC257;

		spec->shutup = alc256_shutup;

		spec->init_hook = alc256_init;

		spec->gen.mixer_nid = 0;

		spec->en_3kpull_low = false;

		break;

	case 0x10ec0215:

	case 0x10ec0245: