Commit 748cce43 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Fix initial capsrc selection in patch_alc269() 



In patch_alc269(), we initialize the primary capsrc so that the device
works from the beginning.  It issues CONNECT_SEL verb no matter which
widget is although some widget (e.g. 0x23) has no connection selection
but a mixer, which requires unmuting instead.

This patch fixes the initialization of capsrc by re-using the code as
a helper function.

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

sound/pci/hda/patch_realtek.c

+16 −11
Original line number Diff line number Diff line
@@ -5166,6 +5166,19 @@ static void fixup_automic_adc(struct hda_codec *codec) 
	spec->auto_mic = 0; /* disable auto-mic to be sure */

}













/* select or unmute the given capsrc route */













static void select_or_unmute_capsrc(struct hda_codec *codec, hda_nid_t cap,













				    int idx)













{













	if (get_wcaps_type(get_wcaps(codec, cap)) == AC_WID_AUD_MIX) {













		snd_hda_codec_amp_stereo(codec, cap, HDA_INPUT, idx,













					 HDA_AMP_MUTE, 0);













	} else {













		snd_hda_codec_write_cache(codec, cap, 0,













					  AC_VERB_SET_CONNECT_SEL, idx);













	}













}



























/* set the default connection to that pin */















static int init_capsrc_for_pin(struct hda_codec *codec, hda_nid_t pin)















{









@@ -5180,14 +5193,7 @@ static int init_capsrc_for_pin(struct hda_codec *codec, hda_nid_t pin)













		idx = get_connection_index(codec, cap, pin);















		if (idx < 0)















			continue;













		/* select or unmute this route */













		if (get_wcaps_type(get_wcaps(codec, cap)) == AC_WID_AUD_MIX) {













			snd_hda_codec_amp_stereo(codec, cap, HDA_INPUT, idx,













						 HDA_AMP_MUTE, 0);













		} else {













			snd_hda_codec_write_cache(codec, cap, 0,













					  AC_VERB_SET_CONNECT_SEL, idx);













		}













		select_or_unmute_capsrc(codec, cap, idx);















		return i; /* return the found index */















	}















	return -1; /* not found */










@@ -14364,8 +14370,7 @@ static int alc269_parse_auto_config(struct hda_codec *codec)



























	/* set default input source */















	if (!spec->dual_adc_switch)













		snd_hda_codec_write_cache(codec, spec->capsrc_nids[0],













				  0, AC_VERB_SET_CONNECT_SEL,













		select_or_unmute_capsrc(codec, spec->capsrc_nids[0],















					spec->input_mux->items[0].index);





























	err = alc_auto_add_mic_boost(codec);



































































CRA Git | Maintained and supported by SUSTech CRA and CCSE