Skip to content

Commit 87f627a

Browse files
jason77-wanggregkh
authored andcommitted
ALSA: hda: generic: change the DAC ctl name for LO+SPK or LO+HP
[ Upstream commit f48652b ] Without this change, the DAC ctl's name could be changed only when the machine has both Speaker and Headphone, but we met some machines which only has Lineout and Headhpone, and the Lineout and Headphone share the Audio Mixer0 and DAC0, the ctl's name is set to "Front". On most of machines, the "Front" is used for Speaker only or Lineout only, but on this machine it is shared by Lineout and Headphone, This introduces an issue in the pipewire and pulseaudio, suppose users want the Headphone to be on and the Speaker/Lineout to be off, they could turn off the "Front", this works on most of the machines, but on this machine, the "Front" couldn't be turned off otherwise the headphone will be off too. Here we do some change to let the ctl's name change to "Headphone+LO" on this machine, and pipewire and pulseaudio already could handle "Headphone+LO" and "Speaker+LO". (https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/747) BugLink: http://bugs.launchpad.net/bugs/804178 Signed-off-by: Hui Wang <hui.wang@canonical.com> Link: https://lore.kernel.org/r/20210504073917.22406-1-hui.wang@canonical.com Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 027926f commit 87f627a

1 file changed

Lines changed: 11 additions & 5 deletions

File tree

sound/pci/hda/hda_generic.c

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,11 +1202,17 @@ static const char *get_line_out_pfx(struct hda_codec *codec, int ch,
12021202
*index = ch;
12031203
return "Headphone";
12041204
case AUTO_PIN_LINE_OUT:
1205-
/* This deals with the case where we have two DACs and
1206-
* one LO, one HP and one Speaker */
1207-
if (!ch && cfg->speaker_outs && cfg->hp_outs) {
1208-
bool hp_lo_shared = !path_has_mixer(codec, spec->hp_paths[0], ctl_type);
1209-
bool spk_lo_shared = !path_has_mixer(codec, spec->speaker_paths[0], ctl_type);
1205+
/* This deals with the case where one HP or one Speaker or
1206+
* one HP + one Speaker need to share the DAC with LO
1207+
*/
1208+
if (!ch) {
1209+
bool hp_lo_shared = false, spk_lo_shared = false;
1210+
1211+
if (cfg->speaker_outs)
1212+
spk_lo_shared = !path_has_mixer(codec,
1213+
spec->speaker_paths[0], ctl_type);
1214+
if (cfg->hp_outs)
1215+
hp_lo_shared = !path_has_mixer(codec, spec->hp_paths[0], ctl_type);
12101216
if (hp_lo_shared && spk_lo_shared)
12111217
return spec->vmaster_mute.hook ? "PCM" : "Master";
12121218
if (hp_lo_shared)

0 commit comments

Comments
 (0)