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

Commit e652f4c8 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Suppress auto-mute feature on some machines with ALC861 



A few machines with ALC861 & co are reported not to work properly with
the auto-mute feature in software.  The auto-mute feature is implemented
in the hardware level, and the jack-detection never works with them.

Also, rename the fixup index as ALC861_FIXUP_* to follow the standard.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 71b1e9e4

sound/pci/hda/patch_realtek.c

+30 −8
Original line number Diff line number Diff line
@@ -5563,8 +5563,10 @@ static const struct hda_amp_list alc861_loopbacks[] = { 


/* Pin config fixes */

enum {

	PINFIX_FSC_AMILO_PI1505,

	PINFIX_ASUS_A6RP,

	ALC861_FIXUP_FSC_AMILO_PI1505,

	ALC861_FIXUP_AMP_VREF_0F,

	ALC861_FIXUP_NO_JACK_DETECT,

	ALC861_FIXUP_ASUS_A6RP,

};



/* On some laptops, VREF of pin 0x0f is abused for controlling the main amp */
@@ -5586,8 +5588,16 @@ static void alc861_fixup_asus_amp_vref_0f(struct hda_codec *codec, 
	spec->keep_vref_in_automute = 1;

}



/* suppress the jack-detection */

static void alc_fixup_no_jack_detect(struct hda_codec *codec,

				     const struct alc_fixup *fix, int action)

{

	if (action == ALC_FIXUP_ACT_PRE_PROBE)

		codec->no_jack_detect = 1;

}	



static const struct alc_fixup alc861_fixups[] = {

	[PINFIX_FSC_AMILO_PI1505] = {

	[ALC861_FIXUP_FSC_AMILO_PI1505] = {

		.type = ALC_FIXUP_PINS,

		.v.pins = (const struct alc_pincfg[]) {

			{ 0x0b, 0x0221101f }, /* HP */
@@ -5595,17 +5605,29 @@ static const struct alc_fixup alc861_fixups[] = { 
			{ }

		}

	},

	[PINFIX_ASUS_A6RP] = {

	[ALC861_FIXUP_AMP_VREF_0F] = {

		.type = ALC_FIXUP_FUNC,

		.v.func = alc861_fixup_asus_amp_vref_0f,

	},

	[ALC861_FIXUP_NO_JACK_DETECT] = {

		.type = ALC_FIXUP_FUNC,

		.v.func = alc_fixup_no_jack_detect,

	},

	[ALC861_FIXUP_ASUS_A6RP] = {

		.type = ALC_FIXUP_FUNC,

		.v.func = alc861_fixup_asus_amp_vref_0f,

		.chained = true,

		.chain_id = ALC861_FIXUP_NO_JACK_DETECT,

	}

};



static const struct snd_pci_quirk alc861_fixup_tbl[] = {

	SND_PCI_QUIRK_VENDOR(0x1043, "ASUS laptop", PINFIX_ASUS_A6RP),

	SND_PCI_QUIRK(0x1584, 0x0000, "Uniwill ECS M31EI", PINFIX_ASUS_A6RP),	

	SND_PCI_QUIRK(0x1584, 0x2b01, "Haier W18", PINFIX_ASUS_A6RP),

	SND_PCI_QUIRK(0x1734, 0x10c7, "FSC Amilo Pi1505", PINFIX_FSC_AMILO_PI1505),

	SND_PCI_QUIRK(0x1043, 0x1393, "ASUS A6Rp", ALC861_FIXUP_ASUS_A6RP),

	SND_PCI_QUIRK_VENDOR(0x1043, "ASUS laptop", ALC861_FIXUP_AMP_VREF_0F),

	SND_PCI_QUIRK(0x1462, 0x7254, "HP DX2200", ALC861_FIXUP_NO_JACK_DETECT),

	SND_PCI_QUIRK(0x1584, 0x2b01, "Haier W18", ALC861_FIXUP_AMP_VREF_0F),

	SND_PCI_QUIRK(0x1584, 0x0000, "Uniwill ECS M31EI", ALC861_FIXUP_AMP_VREF_0F),

	SND_PCI_QUIRK(0x1734, 0x10c7, "FSC Amilo Pi1505", ALC861_FIXUP_FSC_AMILO_PI1505),

	{}

};