UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: hda - Minor update for alc662-parser functions 

Allow alc662_dac_to_mix() and alc662_look_for_dac() to parse
down the selector widget that is found in ALC880-type codecs,
and rename them to alc_auto_*() accordingly.
This is for the next coming multi-io extensions.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2011-04-27 15:14:23 +02:00
parent cb34c207af
commit 604401a92c
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sound/pci/hda/patch_realtek.c
View File

@ -19135,9 +19135,9 @@ static struct alc_config_preset alc662_presets[] = {
*/ */
/* convert from MIX nid to DAC */ /* convert from MIX nid to DAC */
static hda_nid_t alc662_mix_to_dac(struct hda_codec *codec, hda_nid_t nid) static hda_nid_t alc_auto_mix_to_dac(struct hda_codec *codec, hda_nid_t nid)
{ {
hda_nid_t list[4]; hda_nid_t list[5];
int i, num; int i, num;
num = snd_hda_get_connections(codec, nid, list, ARRAY_SIZE(list)); num = snd_hda_get_connections(codec, nid, list, ARRAY_SIZE(list));
@ -19148,33 +19148,45 @@ static hda_nid_t alc662_mix_to_dac(struct hda_codec *codec, hda_nid_t nid)
return 0; return 0;
} }
/* go down to the selector widget before the mixer */
static hda_nid_t alc_go_down_to_selector(struct hda_codec *codec, hda_nid_t pin)
{
hda_nid_t srcs[5];
int num = snd_hda_get_connections(codec, pin, srcs,
ARRAY_SIZE(srcs));
if (num != 1 ||
get_wcaps_type(get_wcaps(codec, srcs[0])) != AC_WID_AUD_SEL)
return pin;
return srcs[0];
}
/* get MIX nid connected to the given pin targeted to DAC */ /* get MIX nid connected to the given pin targeted to DAC */
static hda_nid_t alc662_dac_to_mix(struct hda_codec *codec, hda_nid_t pin, static hda_nid_t alc_auto_dac_to_mix(struct hda_codec *codec, hda_nid_t pin,
hda_nid_t dac) hda_nid_t dac)
{ {
hda_nid_t mix[5]; hda_nid_t mix[5];
int i, num; int i, num;
pin = alc_go_down_to_selector(codec, pin);
num = snd_hda_get_connections(codec, pin, mix, ARRAY_SIZE(mix)); num = snd_hda_get_connections(codec, pin, mix, ARRAY_SIZE(mix));
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
if (alc662_mix_to_dac(codec, mix[i]) == dac) if (alc_auto_mix_to_dac(codec, mix[i]) == dac)
return mix[i]; return mix[i];
} }
return 0; return 0;
} }
/* look for an empty DAC slot */ /* look for an empty DAC slot */
static hda_nid_t alc662_look_for_dac(struct hda_codec *codec, hda_nid_t pin) static hda_nid_t alc_auto_look_for_dac(struct hda_codec *codec, hda_nid_t pin)
{ {
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
hda_nid_t srcs[5]; hda_nid_t srcs[5];
int i, j, num; int i, j, num;
pin = alc_go_down_to_selector(codec, pin);
num = snd_hda_get_connections(codec, pin, srcs, ARRAY_SIZE(srcs)); num = snd_hda_get_connections(codec, pin, srcs, ARRAY_SIZE(srcs));
if (num < 0)
return 0;
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
hda_nid_t nid = alc662_mix_to_dac(codec, srcs[i]); hda_nid_t nid = alc_auto_mix_to_dac(codec, srcs[i]);
if (!nid) if (!nid)
continue; continue;
for (j = 0; j < spec->multiout.num_dacs; j++) for (j = 0; j < spec->multiout.num_dacs; j++)
@ -19196,7 +19208,7 @@ static int alc662_auto_fill_dac_nids(struct hda_codec *codec,
spec->multiout.dac_nids = spec->private_dac_nids; spec->multiout.dac_nids = spec->private_dac_nids;
for (i = 0; i < cfg->line_outs; i++) { for (i = 0; i < cfg->line_outs; i++) {
dac = alc662_look_for_dac(codec, cfg->line_out_pins[i]); dac = alc_auto_look_for_dac(codec, cfg->line_out_pins[i]);
if (!dac) if (!dac)
continue; continue;
spec->multiout.dac_nids[spec->multiout.num_dacs++] = dac; spec->multiout.dac_nids[spec->multiout.num_dacs++] = dac;
@ -19243,7 +19255,7 @@ static int alc662_auto_create_multi_out_ctls(struct hda_codec *codec,
nid = spec->multiout.dac_nids[i]; nid = spec->multiout.dac_nids[i];
if (!nid) if (!nid)
continue; continue;
mix = alc662_dac_to_mix(codec, cfg->line_out_pins[i], nid); mix = alc_auto_dac_to_mix(codec, cfg->line_out_pins[i], nid);
if (!mix) if (!mix)
continue; continue;
if (!pfx && i == 2) { if (!pfx && i == 2) {
@ -19289,7 +19301,7 @@ static int alc662_auto_create_extra_out(struct hda_codec *codec, hda_nid_t pin,
if (!pin) if (!pin)
return 0; return 0;
nid = alc662_look_for_dac(codec, pin); nid = alc_auto_look_for_dac(codec, pin);
if (!nid) { if (!nid) {
/* the corresponding DAC is already occupied */ /* the corresponding DAC is already occupied */
if (!(get_wcaps(codec, pin) & AC_WCAP_OUT_AMP)) if (!(get_wcaps(codec, pin) & AC_WCAP_OUT_AMP))
@ -19299,7 +19311,7 @@ static int alc662_auto_create_extra_out(struct hda_codec *codec, hda_nid_t pin,
HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT)); HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));
} }
mix = alc662_dac_to_mix(codec, pin, nid); mix = alc_auto_dac_to_mix(codec, pin, nid);
if (!mix) if (!mix)
return 0; return 0;
err = alc662_add_vol_ctl(spec, pfx, nid, 3); err = alc662_add_vol_ctl(spec, pfx, nid, 3);
@ -19325,7 +19337,7 @@ static void alc662_auto_set_output_and_unmute(struct hda_codec *codec,
alc_set_pin_output(codec, nid, pin_type); alc_set_pin_output(codec, nid, pin_type);
num = snd_hda_get_connections(codec, nid, srcs, ARRAY_SIZE(srcs)); num = snd_hda_get_connections(codec, nid, srcs, ARRAY_SIZE(srcs));
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
if (alc662_mix_to_dac(codec, srcs[i]) != dac) if (alc_auto_mix_to_dac(codec, srcs[i]) != dac)
continue; continue;
/* need the manual connection? */ /* need the manual connection? */
if (num > 1) if (num > 1)