Commit 117688a9 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda - Correct aamix output paths

The output paths including aamix should be parsed only for the first
output.  The surround paths including aamix must be wrong, since it
would mix all streams, i.e. all channels would be mixed into a single
and multiplexed again.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 2430d7b7
...@@ -918,7 +918,7 @@ static int try_assign_dacs(struct hda_codec *codec, int num_outs, ...@@ -918,7 +918,7 @@ static int try_assign_dacs(struct hda_codec *codec, int num_outs,
badness += bad->no_dac; badness += bad->no_dac;
} }
path = snd_hda_add_new_path(codec, dac, pin, HDA_PARSE_NO_AAMIX); path = snd_hda_add_new_path(codec, dac, pin, HDA_PARSE_NO_AAMIX);
if (!path && i > 0 && spec->mixer_nid) { if (!path && !i && spec->mixer_nid) {
/* try with aamix */ /* try with aamix */
path = snd_hda_add_new_path(codec, dac, pin, HDA_PARSE_ALL); path = snd_hda_add_new_path(codec, dac, pin, HDA_PARSE_ALL);
} }
...@@ -1102,7 +1102,7 @@ static bool map_singles(struct hda_codec *codec, int outs, ...@@ -1102,7 +1102,7 @@ static bool map_singles(struct hda_codec *codec, int outs,
if (!dac) if (!dac)
continue; continue;
path = snd_hda_add_new_path(codec, dac, pins[i], HDA_PARSE_NO_AAMIX); path = snd_hda_add_new_path(codec, dac, pins[i], HDA_PARSE_NO_AAMIX);
if (!path && i > 0 && spec->mixer_nid) if (!path && !i && spec->mixer_nid)
path = snd_hda_add_new_path(codec, dac, pins[i], HDA_PARSE_ALL); path = snd_hda_add_new_path(codec, dac, pins[i], HDA_PARSE_ALL);
if (path) { if (path) {
dacs[i] = dac; dacs[i] = dac;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment