Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ALSA: hda - Move vmaster TLV parsing to snd_hda_gen_parse_auto_config()

Browse source 
Add vmaster_tlv[] to hda_gen_spec and store the suggested TLV data
in snd_hda_gen_parse_auto_config().  This allows the codec driver to
correct the TLV data (e.g. mute capability) before actually creating
vmaster instance.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2013-01-17 10:25:15 +01:00
parent 29476558de
commit 7a71bbf310
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1601,6 +1601,9 @@ static int parse_output_paths(struct hda_codec *codec)
path = snd_hda_get_path_from_idx(codec, spec->out_paths[0]); path = snd_hda_get_path_from_idx(codec, spec->out_paths[0]);
if (path) if (path)
spec->vmaster_nid = look_for_out_vol_nid(codec, path); spec->vmaster_nid = look_for_out_vol_nid(codec, path);
if (spec->vmaster_nid)
snd_hda_set_vmaster_tlv(codec, spec->vmaster_nid,
HDA_OUTPUT, spec->vmaster_tlv);
} }
kfree(best_cfg); kfree(best_cfg);
@ -3752,11 +3755,8 @@ int snd_hda_gen_build_controls(struct hda_codec *codec)
/* if we have no master control, let's create it */ /* if we have no master control, let's create it */
if (!spec->no_analog && if (!spec->no_analog &&
!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) { !snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {
unsigned int vmaster_tlv[4];
snd_hda_set_vmaster_tlv(codec, spec->vmaster_nid,
HDA_OUTPUT, vmaster_tlv);
err = snd_hda_add_vmaster(codec, "Master Playback Volume", err = snd_hda_add_vmaster(codec, "Master Playback Volume",
vmaster_tlv, slave_pfxs, spec->vmaster_tlv, slave_pfxs,
"Playback Volume"); "Playback Volume");
if (err < 0) if (err < 0)
return err; return err;

1
sound/pci/hda/hda_generic.h
View file

@ -214,6 +214,7 @@ struct hda_gen_spec {
/* for virtual master */ /* for virtual master */
hda_nid_t vmaster_nid; hda_nid_t vmaster_nid;
unsigned int vmaster_tlv[4];
struct hda_vmaster_mute_hook vmaster_mute; struct hda_vmaster_mute_hook vmaster_mute;
#ifdef CONFIG_PM #ifdef CONFIG_PM
struct hda_loopback_check loopback; struct hda_loopback_check loopback;