Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7d0f724 authored by Kailang Yang's avatar Kailang Yang Committed by Greg Kroah-Hartman
Browse files

ALSA: hda/realtek - Fixed HP headset Mic can't be detected 



commit 8a8de09cb2adc119104f35044d1a840dd47aa9d8 upstream.

System boot with plugged headset. It will not detect headset Mic.
It will happen on cold boot restart resume state.
Quirk by SSID change to quirk by pin verb.

Fixes: 13468bfa8c58 ("ALSA: hda/realtek - set mic to auto detect on a HP AIO machine")
Signed-off-by: default avatarKailang Yang <kailang@realtek.com>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/f42ae1ede1cf47029ae2bef1a42caf03@realtek.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 61402d61

sound/pci/hda/patch_realtek.c

+43 −11
Original line number Diff line number Diff line
@@ -5990,26 +5990,38 @@ static void alc285_fixup_invalidate_dacs(struct hda_codec *codec, 
	snd_hda_override_wcaps(codec, 0x03, 0);

}



static void alc295_fixup_chromebook(struct hda_codec *codec,

				    const struct hda_fixup *fix, int action)

static void alc_combo_jack_hp_jd_restart(struct hda_codec *codec)

{

	struct alc_spec *spec = codec->spec;



	switch (action) {

	case HDA_FIXUP_ACT_PRE_PROBE:

		spec->ultra_low_power = true;

		break;

	case HDA_FIXUP_ACT_INIT:

	switch (codec->core.vendor_id) {

	case 0x10ec0274:

	case 0x10ec0294:

	case 0x10ec0225:

	case 0x10ec0295:

	case 0x10ec0299:

		alc_update_coef_idx(codec, 0x4a, 0x8000, 1 << 15); /* Reset HP JD */

		alc_update_coef_idx(codec, 0x4a, 0x8000, 0 << 15);

		break;

	case 0x10ec0235:

	case 0x10ec0236:

	case 0x10ec0255:

	case 0x10ec0256:

		alc_update_coef_idx(codec, 0x1b, 0x8000, 1 << 15); /* Reset HP JD */

		alc_update_coef_idx(codec, 0x1b, 0x8000, 0 << 15);

		break;

	}

}



static void alc295_fixup_chromebook(struct hda_codec *codec,

				    const struct hda_fixup *fix, int action)

{

	struct alc_spec *spec = codec->spec;



	switch (action) {

	case HDA_FIXUP_ACT_PRE_PROBE:

		spec->ultra_low_power = true;

		break;

	case HDA_FIXUP_ACT_INIT:

		alc_combo_jack_hp_jd_restart(codec);

		break;

	}

}
@@ -6065,6 +6077,16 @@ static void alc285_fixup_hp_gpio_amp_init(struct hda_codec *codec, 
	alc_write_coef_idx(codec, 0x65, 0x0);

}



static void alc274_fixup_hp_headset_mic(struct hda_codec *codec,

				    const struct hda_fixup *fix, int action)

{

	switch (action) {

	case HDA_FIXUP_ACT_INIT:

		alc_combo_jack_hp_jd_restart(codec);

		break;

	}

}



/* for hda_fixup_thinkpad_acpi() */

#include "thinkpad_helper.c"
@@ -6259,6 +6281,7 @@ enum { 
	ALC256_FIXUP_INTEL_NUC8_RUGGED,

	ALC255_FIXUP_XIAOMI_HEADSET_MIC,

	ALC274_FIXUP_HP_MIC,

	ALC274_FIXUP_HP_HEADSET_MIC,

};



static const struct hda_fixup alc269_fixups[] = {
@@ -7646,6 +7669,12 @@ static const struct hda_fixup alc269_fixups[] = { 
			{ }

		},

	},

	[ALC274_FIXUP_HP_HEADSET_MIC] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc274_fixup_hp_headset_mic,

		.chained = true,

		.chain_id = ALC274_FIXUP_HP_MIC

	},

};



static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -7797,7 +7826,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	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_AMP_INIT),

	SND_PCI_QUIRK(0x103c, 0x874e, "HP", ALC274_FIXUP_HP_MIC),

	SND_PCI_QUIRK(0x103c, 0x8760, "HP", ALC285_FIXUP_HP_MUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x877a, "HP", ALC285_FIXUP_HP_MUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x877d, "HP", ALC236_FIXUP_HP_MUTE_LED),
@@ -8353,6 +8381,10 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { 
		{0x1a, 0x90a70130},

		{0x1b, 0x90170110},

		{0x21, 0x03211020}),

       SND_HDA_PIN_QUIRK(0x10ec0274, 0x103c, "HP", ALC274_FIXUP_HP_HEADSET_MIC,

		{0x17, 0x90170110},

		{0x19, 0x03a11030},

		{0x21, 0x03211020}),

	SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4,

		{0x12, 0x90a60130},

		{0x14, 0x90170110},