renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 06:34:11 +08:00
Code

ALSA: hda/realtek - Consolidate to a single path list

Browse Source 
We don't have to keep three individual path lists for input, output
and loopback.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2012-12-14 16:39:22 +01:00
parent 9c64076e54
commit c9967f1cba
1 changed files with 37 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,14 +192,8 @@ struct alc_spec {
int num_all_dacs; int num_all_dacs;
hda_nid_t all_dacs[16]; hda_nid_t all_dacs[16];
/* output paths */ /* path list */
struct snd_array out_path; struct snd_array paths;
/* input paths */
struct snd_array in_path;
/* analog loopback paths */
struct snd_array loopback_path;
/* hooks */ /* hooks */
void (*init_hook)(struct hda_codec *codec); void (*init_hook)(struct hda_codec *codec);
@ -2412,9 +2406,7 @@ static void alc_free(struct hda_codec *codec)
alc_free_kctls(codec); alc_free_kctls(codec);
alc_free_bind_ctls(codec); alc_free_bind_ctls(codec);
snd_array_free(&spec->out_path); snd_array_free(&spec->paths);
snd_array_free(&spec->in_path);
snd_array_free(&spec->loopback_path);
snd_hda_gen_free(&spec->gen); snd_hda_gen_free(&spec->gen);
kfree(spec); kfree(spec);
snd_hda_detach_beep_device(codec); snd_hda_detach_beep_device(codec);
@ -2651,7 +2643,7 @@ static int new_analog_input(struct hda_codec *codec, hda_nid_t pin,
!nid_has_mute(codec, mix_nid, HDA_INPUT)) !nid_has_mute(codec, mix_nid, HDA_INPUT))
return 0; /* no need for analog loopback */ return 0; /* no need for analog loopback */
path = snd_array_new(&spec->loopback_path); path = snd_array_new(&spec->paths);
if (!path) if (!path)
return -ENOMEM; return -ENOMEM;
memset(path, 0, sizeof(*path)); memset(path, 0, sizeof(*path));
@ -2684,7 +2676,7 @@ static int new_capture_source(struct hda_codec *codec, int adc_idx,
struct hda_input_mux *imux = &spec->private_imux[0]; struct hda_input_mux *imux = &spec->private_imux[0];
struct nid_path *path; struct nid_path *path;
path = snd_array_new(&spec->in_path); path = snd_array_new(&spec->paths);
if (!path) if (!path)
return -ENOMEM; return -ENOMEM;
memset(path, 0, sizeof(*path)); memset(path, 0, sizeof(*path));
@ -2894,8 +2886,8 @@ static bool alc_is_dac_already_used(struct hda_codec *codec, hda_nid_t nid)
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
int i; int i;
for (i = 0; i < spec->out_path.used; i++) { for (i = 0; i < spec->paths.used; i++) {
struct nid_path *path = snd_array_elem(&spec->out_path, i); struct nid_path *path = snd_array_elem(&spec->paths, i);
if (path->path[0] == nid) if (path->path[0] == nid)
return true; return true;
} }
@ -3018,8 +3010,8 @@ static bool is_ctl_used(struct hda_codec *codec, unsigned int val, int type)
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
int i; int i;
for (i = 0; i < spec->out_path.used; i++) { for (i = 0; i < spec->paths.used; i++) {
struct nid_path *path = snd_array_elem(&spec->out_path, i); struct nid_path *path = snd_array_elem(&spec->paths, i);
if (path->ctls[type] == val) if (path->ctls[type] == val)
return true; return true;
} }
@ -3059,14 +3051,14 @@ static bool add_new_out_path(struct hda_codec *codec, hda_nid_t pin,
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
struct nid_path *path; struct nid_path *path;
path = snd_array_new(&spec->out_path); path = snd_array_new(&spec->paths);
if (!path) if (!path)
return false; return false;
memset(path, 0, sizeof(*path)); memset(path, 0, sizeof(*path));
if (parse_nid_path(codec, dac, pin, 0, path)) if (parse_nid_path(codec, dac, pin, 0, path))
return true; return true;
/* push back */ /* push back */
spec->out_path.used--; spec->paths.used--;
return false; return false;
} }
@ -3079,8 +3071,8 @@ static struct nid_path *get_out_path(struct hda_codec *codec, hda_nid_t pin,
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
int i; int i;
for (i = 0; i < spec->out_path.used; i++) { for (i = 0; i < spec->paths.used; i++) {
struct nid_path *path = snd_array_elem(&spec->out_path, i); struct nid_path *path = snd_array_elem(&spec->paths, i);
if (path->depth <= 0) if (path->depth <= 0)
continue; continue;
if ((!dac || path->path[0] == dac) && if ((!dac || path->path[0] == dac) &&
@ -3258,7 +3250,7 @@ static int fill_and_eval_dacs(struct hda_codec *codec,
memset(spec->multiout.hp_out_nid, 0, sizeof(spec->multiout.hp_out_nid)); memset(spec->multiout.hp_out_nid, 0, sizeof(spec->multiout.hp_out_nid));
memset(spec->multiout.extra_out_nid, 0, sizeof(spec->multiout.extra_out_nid)); memset(spec->multiout.extra_out_nid, 0, sizeof(spec->multiout.extra_out_nid));
spec->multi_ios = 0; spec->multi_ios = 0;
snd_array_free(&spec->out_path); snd_array_free(&spec->paths);
badness = 0; badness = 0;
/* fill hard-wired DACs first */ /* fill hard-wired DACs first */
@ -3804,17 +3796,18 @@ static int alc_auto_create_speaker_out(struct hda_codec *codec)
"Speaker"); "Speaker");
} }
static bool is_ctl_associated_in_list(struct snd_array *array, hda_nid_t nid, /* check whether a control with the given (nid, dir, idx) was assigned */
int dir, int idx, int types) static bool is_ctl_associated(struct hda_codec *codec, hda_nid_t nid,
int dir, int idx)
{ {
struct alc_spec *spec = codec->spec;
int i, type; int i, type;
for (i = 0; i < array->used; i++) { for (i = 0; i < spec->paths.used; i++) {
struct nid_path *p = snd_array_elem(array, i); struct nid_path *p = snd_array_elem(&spec->paths, i);
if (p->depth <= 0) if (p->depth <= 0)
continue; continue;
for (type = 0; type < 2; type++) { for (type = 0; type < 2; type++) {
if (types & (1 << type)) {
unsigned int val = p->ctls[type]; unsigned int val = p->ctls[type];
if (get_amp_nid_(val) == nid && if (get_amp_nid_(val) == nid &&
get_amp_direction_(val) == dir && get_amp_direction_(val) == dir &&
@ -3822,20 +3815,9 @@ static bool is_ctl_associated_in_list(struct snd_array *array, hda_nid_t nid,
return true; return true;
} }
} }
}
return false; return false;
} }
/* check whether a control with the given (nid, dir, idx) was assigned */
static bool is_ctl_associated(struct hda_codec *codec, hda_nid_t nid,
int dir, int idx)
{
struct alc_spec *spec = codec->spec;
return is_ctl_associated_in_list(&spec->out_path, nid, dir, idx, 3) ||
is_ctl_associated_in_list(&spec->in_path, nid, dir, idx, 3) ||
is_ctl_associated_in_list(&spec->loopback_path, nid, dir, idx, 3);
}
/* can have the amp-in capability? */ /* can have the amp-in capability? */
static bool has_amp_in(struct hda_codec *codec, struct nid_path *path, int idx) static bool has_amp_in(struct hda_codec *codec, struct nid_path *path, int idx)
{ {
@ -3864,13 +3846,15 @@ static bool has_amp_out(struct hda_codec *codec, struct nid_path *path, int idx)
return true; return true;
} }
static bool is_active_in_list(struct hda_codec *codec, struct snd_array *array, /* check whether the given (nid,dir,idx) is active */
hda_nid_t nid, int dir, int idx) static bool is_active_nid(struct hda_codec *codec, hda_nid_t nid,
unsigned int idx, unsigned int dir)
{ {
struct alc_spec *spec = codec->spec;
int i, n; int i, n;
for (n = 0; n < array->used; n++) { for (n = 0; n < spec->paths.used; n++) {
struct nid_path *path = snd_array_elem(array, n); struct nid_path *path = snd_array_elem(&spec->paths, n);
if (!path->active) if (!path->active)
continue; continue;
for (i = 0; i < path->depth; i++) { for (i = 0; i < path->depth; i++) {
@ -3884,16 +3868,6 @@ static bool is_active_in_list(struct hda_codec *codec, struct snd_array *array,
return false; return false;
} }
/* check whether the given (nid,dir,idx) is active */
static bool is_active_nid(struct hda_codec *codec, hda_nid_t nid,
unsigned int idx, unsigned int dir)
{
struct alc_spec *spec = codec->spec;
return is_active_in_list(codec, &spec->out_path, nid, idx, dir) ||
is_active_in_list(codec, &spec->in_path, nid, idx, dir) ||
is_active_in_list(codec, &spec->loopback_path, nid, idx, dir);
}
/* get the default amp value for the target state */ /* get the default amp value for the target state */
static int get_amp_val_to_activate(struct hda_codec *codec, hda_nid_t nid, static int get_amp_val_to_activate(struct hda_codec *codec, hda_nid_t nid,
int dir, bool enable) int dir, bool enable)
@ -4163,7 +4137,7 @@ static int alc_auto_fill_multi_ios(struct hda_codec *codec,
} }
if (!hardwired && spec->multi_ios < 2) { if (!hardwired && spec->multi_ios < 2) {
/* cancel newly assigned paths */ /* cancel newly assigned paths */
spec->out_path.used -= spec->multi_ios - old_pins; spec->paths.used -= spec->multi_ios - old_pins;
spec->multi_ios = old_pins; spec->multi_ios = old_pins;
return badness; return badness;
} }
@ -4659,9 +4633,7 @@ static int alc_alloc_spec(struct hda_codec *codec, hda_nid_t mixer_nid)
snd_hda_gen_init(&spec->gen); snd_hda_gen_init(&spec->gen);
snd_array_init(&spec->kctls, sizeof(struct snd_kcontrol_new), 32); snd_array_init(&spec->kctls, sizeof(struct snd_kcontrol_new), 32);
snd_array_init(&spec->bind_ctls, sizeof(struct hda_bind_ctls *), 8); snd_array_init(&spec->bind_ctls, sizeof(struct hda_bind_ctls *), 8);
snd_array_init(&spec->out_path, sizeof(struct nid_path), 8); snd_array_init(&spec->paths, sizeof(struct nid_path), 8);
snd_array_init(&spec->in_path, sizeof(struct nid_path), 8);
snd_array_init(&spec->loopback_path, sizeof(struct nid_path), 8);
err = alc_codec_rename_from_preset(codec); err = alc_codec_rename_from_preset(codec);
if (err < 0) { if (err < 0) {