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

Commit 3f3b7c1a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Fix ALC268 parser for mono speaker 



- Parse the mono output pin 0x16 correctly even as the primary output
- Create "Speaker" volume control if the primary output is a speaker
- Fix the wrong direction of (optional) "Mono" switch

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

sound/pci/hda/patch_realtek.c

+43 −19
Original line number Diff line number Diff line
@@ -11816,26 +11816,38 @@ static int alc268_new_analog_output(struct alc_spec *spec, hda_nid_t nid, 
				    const char *ctlname, int idx)

{

	char name[32];

	hda_nid_t dac;

	int err;















	sprintf(name, "%s Playback Volume", ctlname);













	if (nid == 0x14) {













		err = add_control(spec, ALC_CTL_WIDGET_VOL, name,













				  HDA_COMPOSE_AMP_VAL(0x02, 3, idx,













						      HDA_OUTPUT));













		if (err < 0)













			return err;













	} else if (nid == 0x15) {













	switch (nid) {













	case 0x14:













	case 0x16:













		dac = 0x02;













		break;













	case 0x15:













		dac = 0x03;













		break;













	default:













		return 0;













	}













	if (spec->multiout.dac_nids[0] != dac &&













	    spec->multiout.dac_nids[1] != dac) {















		err = add_control(spec, ALC_CTL_WIDGET_VOL, name,













				  HDA_COMPOSE_AMP_VAL(0x03, 3, idx,













				  HDA_COMPOSE_AMP_VAL(dac, 3, idx,















						      HDA_OUTPUT));















		if (err < 0)















			return err;













	} else













		return -1;













		spec->multiout.dac_nids[spec->multiout.num_dacs++] = dac;













	}



























	sprintf(name, "%s Playback Switch", ctlname);













	if (nid != 0x16)















		err = add_control(spec, ALC_CTL_WIDGET_MUTE, name,















			  HDA_COMPOSE_AMP_VAL(nid, 3, idx, HDA_OUTPUT));













	else /* mono */













		err = add_control(spec, ALC_CTL_WIDGET_MUTE, name,













			  HDA_COMPOSE_AMP_VAL(nid, 2, idx, HDA_OUTPUT));















	if (err < 0)















		return err;















	return 0;









@@ -11848,14 +11860,19 @@ static int alc268_auto_create_multi_out_ctls(struct alc_spec *spec,













	hda_nid_t nid;















	int err;



























	spec->multiout.num_dacs = 2;	/* only use one dac */















	spec->multiout.dac_nids = spec->private_dac_nids;













	spec->multiout.dac_nids[0] = 2;













	spec->multiout.dac_nids[1] = 3;





























	nid = cfg->line_out_pins[0];













	if (nid)













		alc268_new_analog_output(spec, nid, "Front", 0);













	if (nid) {













		const char *name;













		if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT)













			name = "Speaker";













		else













			name = "Front";













		err = alc268_new_analog_output(spec, nid, name, 0);













		if (err < 0)













			return err;













	}





























	nid = cfg->speaker_pins[0];















	if (nid == 0x1d) {









@@ -11864,16 +11881,23 @@ static int alc268_auto_create_multi_out_ctls(struct alc_spec *spec,













				  HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_INPUT));















		if (err < 0)















			return err;













	} else {













		err = alc268_new_analog_output(spec, nid, "Speaker", 0);













		if (err < 0)













			return err;















	}















	nid = cfg->hp_pins[0];













	if (nid)













		alc268_new_analog_output(spec, nid, "Headphone", 0);













	if (nid) {













		err = alc268_new_analog_output(spec, nid, "Headphone", 0);













		if (err < 0)













			return err;













	}





























	nid = cfg->line_out_pins[1] | cfg->line_out_pins[2];















	if (nid == 0x16) {















		err = add_control(spec, ALC_CTL_WIDGET_MUTE,















				  "Mono Playback Switch",













				  HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_INPUT));













				  HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT));















		if (err < 0)















			return err;















	}