[RFC PATCH 1/2] ALSA: hda - Fix "PCM" name being used on one DAC when there are two DACs

Discussion:

David Henningsson

2014-10-16 13:33:45 UTC

In the scenario where there is one "Line Out", one "Speaker" and one
"Headphone", and there are only two DACs, two outputs will share a DAC.
Currently any mixer on such a DAC will get the "PCM" name, which is
misleading. Instead use "Headphone+LO" or "Speaker+LO" to better
specify what the volume actually controls.

Signed-off-by: David Henningsson <***@canonical.com>
---
sound/pci/hda/hda_generic.c | 13 +++++++++++++
1 file changed, 13 insertions(+)

diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 64220c0..1d742ea 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -1038,6 +1038,19 @@ static const char *get_line_out_pfx(struct hda_codec *codec, int ch,
break;
*index = ch;
return "Headphone";
+ case AUTO_PIN_LINE_OUT:
+ /* This deals with the case where we have two DACs and
+ * one LO, one HP and one Speaker */
+ if (!ch && cfg->speaker_outs && cfg->hp_outs) {
+ bool hp_lo_shared = !path_has_mixer(codec, spec->hp_paths[0], ctl_type);
+ bool spk_lo_shared = !path_has_mixer(codec, spec->speaker_paths[0], ctl_type);
+ if (hp_lo_shared && spk_lo_shared)
+ return spec->vmaster_mute.hook ? "PCM" : "Master";
+ if (hp_lo_shared)
+ return "Headphone+LO";
+ if (spk_lo_shared)
+ return "Speaker+LO";
+ }
}

/* for a single channel output, we don't have to name the channel */

--
1.9.1

David Henningsson

2014-10-16 13:33:46 UTC

Permalink

In case there are speakers or headphones as well, anything that only
covers the line out should not be labelled "PCM". Let's name it
"Line Out" instead for clarity.

Signed-off-by: David Henningsson <***@canonical.com>
---
sound/pci/hda/hda_generic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 1d742ea..c037bab 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -1055,7 +1055,7 @@ static const char *get_line_out_pfx(struct hda_codec *codec, int ch,

/* for a single channel output, we don't have to name the channel */
if (cfg->line_outs == 1 && !spec->multi_ios)
- return "PCM";
+ return "Line Out";

if (ch >= ARRAY_SIZE(channel_name)) {
snd_BUG();

--
1.9.1

Takashi Iwai

2014-10-16 14:54:16 UTC

Permalink

At Thu, 16 Oct 2014 15:33:45 +0200,

Post by David Henningsson
In the scenario where there is one "Line Out", one "Speaker" and one
"Headphone", and there are only two DACs, two outputs will share a DAC.
Currently any mixer on such a DAC will get the "PCM" name, which is
misleading. Instead use "Headphone+LO" or "Speaker+LO" to better
specify what the volume actually controls.

The changes look good. If this passes the tests and is confirmed to
work with the real machine, let's merge them. As this is rather a
fix, we can merge them to 3.18, too, IMO.

thanks,

Takashi

Post by David Henningsson
---
sound/pci/hda/hda_generic.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 64220c0..1d742ea 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -1038,6 +1038,19 @@ static const char *get_line_out_pfx(struct hda_codec *codec, int ch,
break;
*index = ch;
return "Headphone";
+ /* This deals with the case where we have two DACs and
+ * one LO, one HP and one Speaker */
+ if (!ch && cfg->speaker_outs && cfg->hp_outs) {
+ bool hp_lo_shared = !path_has_mixer(codec, spec->hp_paths[0], ctl_type);
+ bool spk_lo_shared = !path_has_mixer(codec, spec->speaker_paths[0], ctl_type);
+ if (hp_lo_shared && spk_lo_shared)
+ return spec->vmaster_mute.hook ? "PCM" : "Master";
+ if (hp_lo_shared)
+ return "Headphone+LO";
+ if (spk_lo_shared)
+ return "Speaker+LO";
+ }
}
/* for a single channel output, we don't have to name the channel */
--
1.9.1

Raymond Yau

2014-10-16 15:02:32 UTC

Permalink

Are there any examples ?

seem there are two cases

1) business desktop with internal speaker
2) notebook with dock line out

https://launchpadlibrarian.net/186782123/AlsaInfo.txt

David Henningsson

2014-10-16 15:10:22 UTC

Permalink

Post by Raymond Yau

Are there any examples ?

I used "hda-emu
codecs/canonical/alc3226-dell-precision-m2800-ccert-201404-14986 -i 1"
when developing the patches.

I don't have any hardware available myself that exposes this behavior,
but I can maybe fake one with hdajackretask, if that counts...

// David

Raymond Yau

2014-10-18 12:33:49 UTC

Permalink

Post by David Henningsson

Post by Raymond Yau

Are there any examples ?

I used "hda-emu

codecs/canonical/alc3226-dell-precision-m2800-ccert-201404-14986 -i 1" when
developing the patches.

Post by David Henningsson
I don't have any hardware available myself that exposes this behavior,

but I can maybe fake one with hdajackretask, if that counts...
How about adding these names to slaves of virtual master volume/switch ?

hdajackretask won't help if the topology of the codecs are different

Seem the badness still prevent the driver to support surround 5.1 with
three rear panel jacks, internal speaker and front panel headphone for
Thinkcenter A58 using alc662

https://www.mail-archive.com/alsa-***@lists.sourceforge.net/msg29203.html

Why 3stack desktops with 6 channels codecs not using "Headphone+LO" or
"Speaker+LO" ?

Takashi Iwai

2014-10-18 18:28:00 UTC

Permalink

At Sat, 18 Oct 2014 20:33:49 +0800,

Post by Raymond Yau

Post by David Henningsson

Post by Raymond Yau

Are there any examples ?

I used "hda-emu

codecs/canonical/alc3226-dell-precision-m2800-ccert-201404-14986 -i 1" when
developing the patches.

Post by David Henningsson
I don't have any hardware available myself that exposes this behavior,

but I can maybe fake one with hdajackretask, if that counts...
How about adding these names to slaves of virtual master volume/switch ?
hdajackretask won't help if the topology of the codecs are different
Seem the badness still prevent the driver to support surround 5.1 with
three rear panel jacks, internal speaker and front panel headphone for
Thinkcenter A58 using alc662
Why 3stack desktops with 6 channels codecs not using "Headphone+LO" or
"Speaker+LO" ?

The problem is just the lack of DACs, so it cannot cover all three
outputs, no matter how the pins are chosen. That is, it's no 6
channels at all but 4 channels at most.

Takashi

Raymond Yau

2014-10-18 23:02:07 UTC