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

ALSA: hda/realtek - Create individual mute switches for shared DAC 



Even if the outputs are using shared DACs, we can still create individual
mute siwtches since they are assigned per pin.  This allows to create,
e.g. Speaker and Bass Speaker mute switches while the single volume is
used for these outputs.

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

sound/pci/hda/patch_realtek.c

+20 −30
Original line number Diff line number Diff line
@@ -3717,41 +3717,31 @@ static int alc_auto_create_extra_outs(struct hda_codec *codec, int num_pins, 
		return alc_auto_create_extra_out(codec, *pins, dac, pfx, 0);

	}



	if (dacs[num_pins - 1]) {

		/* OK, we have a multi-output system with individual volumes */

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

			if (num_pins >= 3) {

		hda_nid_t dac;

		if (dacs[num_pins - 1])

			dac = dacs[i]; /* with individual volumes */

		else

			dac = 0;

		if (num_pins == 2 && i == 1 && !strcmp(pfx, "Speaker")) {

			err = alc_auto_create_extra_out(codec, pins[i], dac,

							"Bass Speaker", 0);

		} else if (num_pins >= 3) {

			snprintf(name, sizeof(name), "%s %s",

				 pfx, channel_name[i]);

				err = alc_auto_create_extra_out(codec, pins[i], dacs[i],

			err = alc_auto_create_extra_out(codec, pins[i], dac,

							name, 0);

		} else {

				err = alc_auto_create_extra_out(codec, pins[i], dacs[i],

			err = alc_auto_create_extra_out(codec, pins[i], dac,

							pfx, i);

		}

		if (err < 0)

			return err;

	}

	if (dacs[num_pins - 1])

		return 0;

	}



	/* Let's create a bind-controls */

	ctl = new_bind_ctl(codec, num_pins, &snd_hda_bind_sw);

	if (!ctl)

		return -ENOMEM;

	n = 0;

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

		if (get_wcaps(codec, pins[i]) & AC_WCAP_OUT_AMP)

			ctl->values[n++] =

				HDA_COMPOSE_AMP_VAL(pins[i], 3, 0, HDA_OUTPUT);

	}

	if (n) {

		snprintf(name, sizeof(name), "%s Playback Switch", pfx);

		err = add_control(spec, ALC_CTL_BIND_SW, name, 0, (long)ctl);

		if (err < 0)

			return err;

	}



	/* Let's create a bind-controls for volumes */

	ctl = new_bind_ctl(codec, num_pins, &snd_hda_bind_vol);

	if (!ctl)

		return -ENOMEM;