evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALSA: hda - Improve debug prints for output paths

Browse source 
Print the information of outputs in a bit more details and concisely
in a single place instead of printing the path at each time when
detected.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2013-01-21 10:43:18 +01:00
parent 164a7adac9
commit a769409cf3
1 changed files with 46 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
sound/pci/hda/hda_generic.c
View file

@ -1113,7 +1113,7 @@ static int try_assign_dacs(struct hda_codec *codec, int num_outs,
if (!path) if (!path)
dac = dacs[i] = 0; dac = dacs[i] = 0;
else { else {
print_nid_path("output", path); /* print_nid_path("output", path); */
path->active = true; path->active = true;
path_idx[i] = snd_hda_get_path_idx(codec, path); path_idx[i] = snd_hda_get_path_idx(codec, path);
badness += assign_out_path_ctls(codec, path); badness += assign_out_path_ctls(codec, path);
@ -1240,7 +1240,7 @@ static int fill_multi_ios(struct hda_codec *codec,
badness++; badness++;
continue; continue;
} }
print_nid_path("multiio", path); /* print_nid_path("multiio", path); */
spec->multi_io[spec->multi_ios].pin = nid; spec->multi_io[spec->multi_ios].pin = nid;
spec->multi_io[spec->multi_ios].dac = dac; spec->multi_io[spec->multi_ios].dac = dac;
spec->out_paths[cfg->line_outs + spec->multi_ios] = spec->out_paths[cfg->line_outs + spec->multi_ios] =
@ -1297,7 +1297,7 @@ static bool map_singles(struct hda_codec *codec, int outs,
if (path) { if (path) {
dacs[i] = dac; dacs[i] = dac;
found = true; found = true;
print_nid_path("output", path); /* print_nid_path("output", path); */
path->active = true; path->active = true;
path_idx[i] = snd_hda_get_path_idx(codec, path); path_idx[i] = snd_hda_get_path_idx(codec, path);
} }
@ -1320,7 +1320,7 @@ static int check_aamix_out_path(struct hda_codec *codec, int path_idx)
spec->mixer_nid); spec->mixer_nid);
if (!path) if (!path)
return 0; return 0;
print_nid_path("output-aamix", path); /* print_nid_path("output-aamix", path); */
path->active = false; /* unused as default */ path->active = false; /* unused as default */
return snd_hda_get_path_idx(codec, path); return snd_hda_get_path_idx(codec, path);
} }
@ -1514,35 +1514,70 @@ static int fill_and_eval_dacs(struct hda_codec *codec,
#define debug_badness(...) #define debug_badness(...)
#endif #endif
static void debug_show_configs(struct hda_gen_spec *spec, struct auto_pin_cfg *cfg) #ifdef DEBUG_BADNESS
static inline void print_nid_path_idx(struct hda_codec *codec,
const char *pfx, int idx)
{ {
debug_badness("multi_outs = %x/%x/%x/%x : %x/%x/%x/%x\n", struct nid_path *path;
path = snd_hda_get_path_from_idx(codec, idx);
if (path)
print_nid_path(pfx, path);
}
static void debug_show_configs(struct hda_codec *codec,
struct auto_pin_cfg *cfg)
{
struct hda_gen_spec *spec = codec->spec;
#ifdef CONFIG_SND_DEBUG_VERBOSE
static const char * const lo_type[3] = { "LO", "SP", "HP" };
#endif
int i;
debug_badness("multi_outs = %x/%x/%x/%x : %x/%x/%x/%x (type %s)\n",
cfg->line_out_pins[0], cfg->line_out_pins[1], cfg->line_out_pins[0], cfg->line_out_pins[1],
cfg->line_out_pins[2], cfg->line_out_pins[3], cfg->line_out_pins[2], cfg->line_out_pins[3],
spec->multiout.dac_nids[0], spec->multiout.dac_nids[0],
spec->multiout.dac_nids[1], spec->multiout.dac_nids[1],
spec->multiout.dac_nids[2], spec->multiout.dac_nids[2],
spec->multiout.dac_nids[3]); spec->multiout.dac_nids[3],
lo_type[cfg->line_out_type]);
for (i = 0; i < cfg->line_outs; i++)
print_nid_path_idx(codec, " out", spec->out_paths[i]);
if (spec->multi_ios > 0) if (spec->multi_ios > 0)
debug_badness("multi_ios(%d) = %x/%x : %x/%x\n", debug_badness("multi_ios(%d) = %x/%x : %x/%x\n",
spec->multi_ios, spec->multi_ios,
spec->multi_io[0].pin, spec->multi_io[1].pin, spec->multi_io[0].pin, spec->multi_io[1].pin,
spec->multi_io[0].dac, spec->multi_io[1].dac); spec->multi_io[0].dac, spec->multi_io[1].dac);
debug_badness("hp_outs = %x/%x/%x/%x : %x/%x/%x/%x\n", for (i = 0; i < spec->multi_ios; i++)
print_nid_path_idx(codec, " mio",
spec->out_paths[cfg->line_outs + i]);
if (cfg->hp_outs)
debug_badness("hp_outs = %x/%x/%x/%x : %x/%x/%x/%x\n",
cfg->hp_pins[0], cfg->hp_pins[1], cfg->hp_pins[0], cfg->hp_pins[1],
cfg->hp_pins[2], cfg->hp_pins[3], cfg->hp_pins[2], cfg->hp_pins[3],
spec->multiout.hp_out_nid[0], spec->multiout.hp_out_nid[0],
spec->multiout.hp_out_nid[1], spec->multiout.hp_out_nid[1],
spec->multiout.hp_out_nid[2], spec->multiout.hp_out_nid[2],
spec->multiout.hp_out_nid[3]); spec->multiout.hp_out_nid[3]);
debug_badness("spk_outs = %x/%x/%x/%x : %x/%x/%x/%x\n", for (i = 0; i < cfg->hp_outs; i++)
print_nid_path_idx(codec, " hp ", spec->hp_paths[i]);
if (cfg->speaker_outs)
debug_badness("spk_outs = %x/%x/%x/%x : %x/%x/%x/%x\n",
cfg->speaker_pins[0], cfg->speaker_pins[1], cfg->speaker_pins[0], cfg->speaker_pins[1],
cfg->speaker_pins[2], cfg->speaker_pins[3], cfg->speaker_pins[2], cfg->speaker_pins[3],
spec->multiout.extra_out_nid[0], spec->multiout.extra_out_nid[0],
spec->multiout.extra_out_nid[1], spec->multiout.extra_out_nid[1],
spec->multiout.extra_out_nid[2], spec->multiout.extra_out_nid[2],
spec->multiout.extra_out_nid[3]); spec->multiout.extra_out_nid[3]);
for (i = 0; i < cfg->speaker_outs; i++)
print_nid_path_idx(codec, " spk", spec->speaker_paths[i]);
for (i = 0; i < 3; i++)
print_nid_path_idx(codec, " mix", spec->aamix_out_paths[i]);
} }
#else
#define debug_show_configs(codec, cfg) /* NOP */
#endif
/* find all available DACs of the codec */ /* find all available DACs of the codec */
static void fill_all_dac_nids(struct hda_codec *codec) static void fill_all_dac_nids(struct hda_codec *codec)
@ -1590,7 +1625,7 @@ static int parse_output_paths(struct hda_codec *codec)
debug_badness("==> lo_type=%d, wired=%d, mio=%d, badness=0x%x\n", debug_badness("==> lo_type=%d, wired=%d, mio=%d, badness=0x%x\n",
cfg->line_out_type, fill_hardwired, fill_mio_first, cfg->line_out_type, fill_hardwired, fill_mio_first,
badness); badness);
debug_show_configs(spec, cfg); debug_show_configs(codec, cfg);
if (badness < best_badness) { if (badness < best_badness) {
best_badness = badness; best_badness = badness;
*best_cfg = *cfg; *best_cfg = *cfg;
@ -1646,7 +1681,7 @@ static int parse_output_paths(struct hda_codec *codec)
} }
debug_badness("==> Best config: lo_type=%d, wired=%d, mio=%d\n", debug_badness("==> Best config: lo_type=%d, wired=%d, mio=%d\n",
cfg->line_out_type, best_wired, best_mio); cfg->line_out_type, best_wired, best_mio);
debug_show_configs(spec, cfg); debug_show_configs(codec, cfg);
if (cfg->line_out_pins[0]) { if (cfg->line_out_pins[0]) {
struct nid_path *path; struct nid_path *path;