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

Commit baba8ee9 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] hda-codec - Fix output pin types in auto configuration 



Use PIN_HP output type for HP pin widgets accordingly, instead of
always applying PIN_OUT.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent d258e24a

sound/pci/hda/patch_realtek.c

+25 −9
Original line number Original line Diff line number Diff line
@@ -3095,6 +3095,14 @@ static void alc880_auto_set_output_and_unmute(struct hda_codec *codec, 
	}

	}

}

}





static int get_pin_type(int line_out_type)

{

	if (line_out_type == AUTO_PIN_HP_OUT)

		return PIN_HP;

	else

		return PIN_OUT;

}



static void alc880_auto_init_multi_out(struct hda_codec *codec)

static void alc880_auto_init_multi_out(struct hda_codec *codec)

{

{

	struct alc_spec *spec = codec->spec;

	struct alc_spec *spec = codec->spec;
@@ -3103,7 +3111,8 @@ static void alc880_auto_init_multi_out(struct hda_codec *codec) 
	alc_subsystem_id(codec, 0x15, 0x1b, 0x14);

	alc_subsystem_id(codec, 0x15, 0x1b, 0x14);

	for (i = 0; i < spec->autocfg.line_outs; i++) {

	for (i = 0; i < spec->autocfg.line_outs; i++) {

		hda_nid_t nid = spec->autocfg.line_out_pins[i];

		hda_nid_t nid = spec->autocfg.line_out_pins[i];

		alc880_auto_set_output_and_unmute(codec, nid, PIN_OUT, i);

		int pin_type = get_pin_type(spec->autocfg.line_out_type);

		alc880_auto_set_output_and_unmute(codec, nid, pin_type, i);

	}

	}

}

}
@@ -4292,8 +4301,10 @@ static void alc260_auto_init_multi_out(struct hda_codec *codec) 




	alc_subsystem_id(codec, 0x10, 0x15, 0x0f);

	alc_subsystem_id(codec, 0x10, 0x15, 0x0f);

	nid = spec->autocfg.line_out_pins[0];

	nid = spec->autocfg.line_out_pins[0];

	if (nid)

	if (nid) {

		alc260_auto_set_output_and_unmute(codec, nid, PIN_OUT, 0);

		int pin_type = get_pin_type(spec->autocfg.line_out_type);

		alc260_auto_set_output_and_unmute(codec, nid, pin_type, 0);

	}

	

	

	nid = spec->autocfg.speaker_pins[0];

	nid = spec->autocfg.speaker_pins[0];

	if (nid)

	if (nid)
@@ -4301,7 +4312,7 @@ static void alc260_auto_init_multi_out(struct hda_codec *codec) 




	nid = spec->autocfg.hp_pins[0];

	nid = spec->autocfg.hp_pins[0];

	if (nid)

	if (nid)

		alc260_auto_set_output_and_unmute(codec, nid, PIN_OUT, 0);

		alc260_auto_set_output_and_unmute(codec, nid, PIN_HP, 0);

}

}





#define ALC260_PIN_CD_NID		0x16

#define ALC260_PIN_CD_NID		0x16
@@ -5164,8 +5175,9 @@ static void alc882_auto_init_multi_out(struct hda_codec *codec) 
	alc_subsystem_id(codec, 0x15, 0x1b, 0x14);

	alc_subsystem_id(codec, 0x15, 0x1b, 0x14);

	for (i = 0; i <= HDA_SIDE; i++) {

	for (i = 0; i <= HDA_SIDE; i++) {

		hda_nid_t nid = spec->autocfg.line_out_pins[i];

		hda_nid_t nid = spec->autocfg.line_out_pins[i];

		int pin_type = get_pin_type(spec->autocfg.line_out_type);

		if (nid)

		if (nid)

			alc882_auto_set_output_and_unmute(codec, nid, PIN_OUT,

			alc882_auto_set_output_and_unmute(codec, nid, pin_type,

							  i);

							  i);

	}

	}

}

}
@@ -6185,8 +6197,9 @@ static void alc883_auto_init_multi_out(struct hda_codec *codec) 
	alc_subsystem_id(codec, 0x15, 0x1b, 0x14);

	alc_subsystem_id(codec, 0x15, 0x1b, 0x14);

	for (i = 0; i <= HDA_SIDE; i++) {

	for (i = 0; i <= HDA_SIDE; i++) {

		hda_nid_t nid = spec->autocfg.line_out_pins[i];

		hda_nid_t nid = spec->autocfg.line_out_pins[i];

		int pin_type = get_pin_type(spec->autocfg.line_out_type);

		if (nid)

		if (nid)

			alc883_auto_set_output_and_unmute(codec, nid, PIN_OUT,

			alc883_auto_set_output_and_unmute(codec, nid, pin_type,

							  i);

							  i);

	}

	}

}

}
@@ -8182,8 +8195,9 @@ static void alc861_auto_init_multi_out(struct hda_codec *codec) 
	alc_subsystem_id(codec, 0x0e, 0x0f, 0x0b);

	alc_subsystem_id(codec, 0x0e, 0x0f, 0x0b);

	for (i = 0; i < spec->autocfg.line_outs; i++) {

	for (i = 0; i < spec->autocfg.line_outs; i++) {

		hda_nid_t nid = spec->autocfg.line_out_pins[i];

		hda_nid_t nid = spec->autocfg.line_out_pins[i];

		int pin_type = get_pin_type(spec->autocfg.line_out_type);

		if (nid)

		if (nid)

			alc861_auto_set_output_and_unmute(codec, nid, PIN_OUT,

			alc861_auto_set_output_and_unmute(codec, nid, pin_type,

							  spec->multiout.dac_nids[i]);

							  spec->multiout.dac_nids[i]);

	}

	}

}

}
@@ -8892,9 +8906,10 @@ static void alc861vd_auto_init_multi_out(struct hda_codec *codec) 
	alc_subsystem_id(codec, 0x15, 0x1b, 0x14);

	alc_subsystem_id(codec, 0x15, 0x1b, 0x14);

	for (i = 0; i <= HDA_SIDE; i++) {

	for (i = 0; i <= HDA_SIDE; i++) {

		hda_nid_t nid = spec->autocfg.line_out_pins[i];

		hda_nid_t nid = spec->autocfg.line_out_pins[i];

		int pin_type = get_pin_type(spec->autocfg.line_out_type);

		if (nid)

		if (nid)

			alc861vd_auto_set_output_and_unmute(codec, nid,

			alc861vd_auto_set_output_and_unmute(codec, nid,

								PIN_OUT, i);

							    pin_type, i);

	}

	}

}

}
@@ -9867,8 +9882,9 @@ static void alc662_auto_init_multi_out(struct hda_codec *codec) 




	for (i = 0; i <= HDA_SIDE; i++) {

	for (i = 0; i <= HDA_SIDE; i++) {

		hda_nid_t nid = spec->autocfg.line_out_pins[i];

		hda_nid_t nid = spec->autocfg.line_out_pins[i];

		int pin_type = get_pin_type(spec->autocfg.line_out_type);

		if (nid)

		if (nid)

			alc662_auto_set_output_and_unmute(codec, nid, PIN_OUT,

			alc662_auto_set_output_and_unmute(codec, nid, pin_type,

							  i);

							  i);

	}

	}

}

}