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

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

ALSA: hda - Fix MSI GX620 mixer 



The headphone and speaker mixer elements aren't properly set for
MSI GX620 with targa-8ch-dig quirk.
Also fixed the speaker volume control for other ALC883-targa quirks,
too.

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

sound/pci/hda/patch_realtek.c

+15 −3
Original line number Original line Diff line number Diff line
@@ -7927,8 +7927,9 @@ static struct snd_kcontrol_new alc883_fivestack_mixer[] = { 
















static struct snd_kcontrol_new alc883_targa_mixer[] = {







static struct snd_kcontrol_new alc883_targa_mixer[] = {











	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),







	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),














	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),











	HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),







	HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),











	HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT),







	HDA_CODEC_MUTE("Speaker Playback Switch", 0x1b, 0x0, HDA_OUTPUT),











	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),







	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),











	HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),







	HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),











	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),







	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),









@@ -7947,8 +7948,9 @@ static struct snd_kcontrol_new alc883_targa_mixer[] = {

























static struct snd_kcontrol_new alc883_targa_2ch_mixer[] = {







static struct snd_kcontrol_new alc883_targa_2ch_mixer[] = {











	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),







	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),














	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),











	HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),







	HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),











	HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT),







	HDA_CODEC_MUTE("Speaker Playback Switch", 0x1b, 0x0, HDA_OUTPUT),











	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),







	HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),











	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),







	HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),











	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),







	HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),









@@ -7960,6 +7962,15 @@ static struct snd_kcontrol_new alc883_targa_2ch_mixer[] = {









	{ } /* end */







	{ } /* end */











};







};






























static struct snd_kcontrol_new alc883_targa_8ch_mixer[] = {














	HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),














	HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),














	HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),














	HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),














	HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),














	{ } /* end */














};
























static struct snd_kcontrol_new alc883_lenovo_101e_2ch_mixer[] = {







static struct snd_kcontrol_new alc883_lenovo_101e_2ch_mixer[] = {











	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),







	HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),











	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),







	HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),










@@ -9167,7 +9178,8 @@ static struct alc_config_preset alc882_presets[] = {









		.init_hook = alc882_targa_automute,







		.init_hook = alc882_targa_automute,











	},







	},











	[ALC883_TARGA_8ch_DIG] = {







	[ALC883_TARGA_8ch_DIG] = {











		.mixers = { alc883_base_mixer, alc883_chmode_mixer },







		.mixers = { alc883_targa_mixer, alc883_targa_8ch_mixer,














			    alc883_chmode_mixer },











		.init_verbs = { alc883_init_verbs, alc880_gpio3_init_verbs,







		.init_verbs = { alc883_init_verbs, alc880_gpio3_init_verbs,











				alc883_targa_verbs },







				alc883_targa_verbs },











		.num_dacs = ARRAY_SIZE(alc883_dac_nids),







		.num_dacs = ARRAY_SIZE(alc883_dac_nids),