Re: [PATCH] ALSA: hda - Fix wrong detection of "Headphone+LO" or "Speaker+LO"

[David Henningsson <david.henningsson@canonical.com>]

[-- Attachment #1: Type: text/plain, Size: 2032 bytes --]



On 2015-03-03 16:04, Ingo Brückl wrote:
> David Henningsson wrote on Tue, 03 Mar 2015 14:24:28 +0100:
>
>> If I understand correctly, you have three DACs, one internal speaker,
>> one headphone jack, and three jacks that are both used for 5.1 surround
>> and line out/mic/line in. Is this correct?
>
> This is correct. In addition I have a front mic jack.

Could you upload/pastebin your alsa-info somewhere? Then we could run it 
through the emulator and reproduce the problem.

>> How do the DACs get assigned in this case? One would assume that you'd
>> get 02 -> Front LO, HP, Speaker, 03 -> Rear LO, 04 -> CLFE LO.
>
> With my private patch to enforce multi-io I seem to lose the internal speaker
> which isn't bad because it isn't connected (and probably never won't be).

Since you're using private patches you're somewhat out on "unsupported" 
ground, but anyhow...

>
> You are right concerning the remaining assignments:
>
> multi_outs = 14/0/0/0 : 2/3/4/0 (type LO)
>    out path: depth=3 '02:0c:14'
> multi_ios(2) = 1a/18 : 3/4
>    mio path: depth=3 '03:0d:1a'
>    mio path: depth=3 '04:0e:18'
> hp_outs = 1b/0/0/0 : 2/0/0/0
>    hp  path: depth=3 '02:0c:1b'
> spk_outs = 15/0/0/0 : 0/0/0/0
>
>> And then the volume/mute control for DAC node 02 would be called "PCM"
>> (since both hp_lo_shared and spk_lo_shared are true), but in fact it would
>> be more appropriate to call it "Front".
>
> I've got a Master that would only affect the Front (PCM) and a PCM that
> affected Surround/CLFE which was very unpleasant.
>
> With the patch I'm getting a real Master (for all Front/Surround/CLFE) and a
> separate Front Volume Control in addition to Surround, Center and LFE which
> is exactly how it should be.

Hmm. What do you think of the attached patch - would it work as well? It 
removes the part that returns early for all three, letting it fall 
through to the part that returns "Front" etc.

-- 
David Henningsson, Canonical Ltd.
https://launchpad.net/~diwic

[-- Attachment #2: pfx.patch --]
[-- Type: text/x-patch, Size: 755 bytes --]

diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index b680b4e..9f0be7c 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -1100,11 +1100,9 @@ static const char *get_line_out_pfx(struct hda_codec *codec, int ch,
 		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)
+			if (hp_lo_shared && !spk_lo_shared)
 				return "Headphone+LO";
-			if (spk_lo_shared)
+			if (spk_lo_shared && !hp_lo_shared)
 				return "Speaker+LO";
 		}
 	}

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]