summaryrefslogtreecommitdiff
path: root/sound/pci/hda/hda_generic.c
AgeCommit message (Collapse)AuthorFilesLines
2013-01-12ALSA: hda - Exclude aamix from capture pathsTakashi Iwai1-6/+2
The capture paths shouldn't contain the analog loopback mixer. Pass a proper argument to exclude the aamix NID. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Add a flag to suppress mic auto-switchTakashi Iwai1-0/+3
Add a new flag spec->suppress_mic_auto_switch for codecs that don't support unsol events properly like VT1708. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Re-define snd_hda_parse_nid_path()Takashi Iwai1-47/+55
This commit modifies the definition of snd_hda_parse_nid_path() slightly, now with_aa_mix argument is changed to anchor_nid, so that it can handle any NID generically as an anchor point to include or exclude. The with_aa_mix field in struct nid_path is removed again by this change. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Manage input paths via path indicesTakashi Iwai1-26/+18
... like we did for output and loopback paths. It makes the code slightly easier. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Fix multi-io channel mode managementTakashi Iwai1-30/+62
The multi-io channels can vary not only from 1 to 6 but also may vary from 6 to 8 or such. At the same time, there are more speaker pins available than the primary output pins. So, we need three variables to check: the minimum channel counts for primary outputs, the current channel counts for primary outputs, and the minimum channel counts for all outputs. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Remove unused dac reference in create_multi_out_ctls()Takashi Iwai1-4/+0
Remove useless code. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Use direct path reference in assign_out_path_ctls()Takashi Iwai1-12/+16
Instead of looking through paths with the dac -> pin connection at each time, just pass the already parsed path index to assign_out_path_ctls(). This simplifies the code a bit. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Clear path indices properly at each re-evaluationTakashi Iwai1-0/+10
The path indices must be reset at each evaluation of DAC assignment. Otherwise the badness value will be wrongly calculated and mixers may be inconsistently assigned. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Add brief comments to exported snd_hda_gen_*_() functionsTakashi Iwai1-1/+12
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Remove dead HDA_CTL_BIND_VOL and HDA_CTL_BIND_SW codesTakashi Iwai1-4/+0
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Add snd_hda_gen_free() and snd_hda_gen_check_power_status()Takashi Iwai1-15/+18
Just to remove duplicated codes. Also fixed EXPORT_SYMBOL() in hda_generic.c. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Add pcm_playback_hook to hda_gen_specTakashi Iwai1-5/+60
The new hook which is called at each PCM playback ops. It can be used to control the codec-specific power-saving feature in each codec driver. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Drop bind-volume workaroundTakashi Iwai1-97/+17
The bind-volume workaround was introduced for simplifying the mixer abstraction in the case where one or more pins of multiple outputs lack of individual volume controls. This was essentially the case like Acer Aspire 5935, which has 5.1 speakers and 5.1 (multi-io) jacks although there are 5 DACs, so some of them must share a DAC. However, the recent code rewrite changed the DAC assignment policy to share with the same channel instead of binding to the front, thus binding the volumes for all channels makes little sense now, rather it's confusing. So in this patch, the ugly workaround is finally dropped and simply create the volume control corresponding to the parsed path position. For dual headphones or 2.1 speakers with a shared volume control, it's anyway bound to the same DAC if needed, so this change shouldn't bring any practical difference. And, as a good bonus, we can cut off the whole code handling the bind volume elements. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Drop unneeded pin argument from set_output_and_unmute()Takashi Iwai1-28/+13
Just a minor refactoring. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Add missing slave names for Speaker Surround, etcTakashi Iwai1-0/+3
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Prefer binding the primary CLFE outputTakashi Iwai1-6/+27
When 5.1 or more multiple speakers with found but not enough DACs are available, it's better to bind such pins to the DACs of the primary outputs with the same channels rather than binding to the first DAC (i.e. the front channel). For the cases with two speaker pins, it's rather regarded as front + bass combination, thus it's more practical to still bind to the front, though. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Fix truncated control namesTakashi Iwai1-2/+2
... like "Speaker Surround Playback Switch". This fix had been already applied to patch_conexant.c but was forgotten in other places, then migrated to hda_generic.c. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Add Loopback Mixing controlTakashi Iwai1-0/+106
For codecs that have individual routes going through a loopback mixer (like VIA codecs), we need to provide an explicit switch to choose whether the output goes through mixer or directly from DAC. This patch adds the check for such paths and creates "Loopback Mixing" enum control when available. It won't influence on codecs like Realtek or others where the loopback mixer is connected independently from the primary output routes. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Correct aamix output pathsTakashi Iwai1-2/+2
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: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Initialize digital-input path properlyTakashi Iwai1-1/+7
Call the path activation for the digital input pin properly, not only setting the pin control. Also add spec->digin_path for keeping the path index. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Manage using output/loopback path indicesTakashi Iwai1-50/+89
Instead of search for the path with the certain route at each time, keep the path index for each output and loopback, and just use it when referred. In this implementation, the path index number begins with one, not zero (although I've been writing in C over decades). It's just to make the check for uninitialized values easier. So far, the input paths aren't handled with indices yet, but still picked up via snd_hda_get_nid_path() at each time. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Fix multi-io pin assignment in create_multi_out_ctls()Takashi Iwai1-1/+1
The multi-io pins are calculated with a blind assumption of cfg->line_outs = 1. This isn't always true. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Simplify the multi-io assignment with multi speakersTakashi Iwai1-31/+32
When speakers are chosen as the the primary output during evaluation, we did some tricks to assign the possible multi-io jacks with a certain offset value to multi_out dacs. This was a workaround for the case with multiple speakers like Acer Aspire. But this is quite ugly at the same time and the resultant code is hard to understand. More badly, it works wrongly for 2.1 speakers like Apple iMac91. In this patch, instead of fiddling with the offset to multi_out dacs, simply add a certain badness number if headphone(s) + multi-ios are possible. This simplify the code a bit, and it's more robust. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Check the existing path in snd_hda_add_new_path()Takashi Iwai1-7/+24
If the requested path has been already added, return the existing path instance instead of adding a duplicated instance. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Avoid duplicated path creationsTakashi Iwai1-2/+7
When the paths are created in map_singles(), we don't have to re-create new paths in try_assign_dacs(). Just evaluate the badness and skip to the next item. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Initialize output paths with current active statesTakashi Iwai1-5/+7
Set path->active flag at the path creation time and let the paths initialized according to the current path->active state in set_output_and_unmute(). This allows to modify the active flag of some output paths dynamically, e.g. switching the front output route with or without aamix like patch_via.c. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Don't skip amp init for activated pathsTakashi Iwai1-1/+1
activate_amp() in the generic parser checks whether the given NID is included in any active paths and skips it if found. This was a workaround for avoiding disabling the widgets in the active paths when one path is disabled, thus it shouldn't be applied to the case for path activation. Due to this wrong check, some analog loopback paths haven't been initialized correctly. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Add hooks for HP/line/mic auto switchingTakashi Iwai1-0/+6
... as a preliminary work for migrating patch_sigmatel.c. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Revive snd_hda_get_conn_list()Takashi Iwai1-4/+4
Manage the connection list cache using linked lists instead of snd_array, and revive snd_hda_get_conn_list() again, so that we don't have to keep the expanded values locally. This will reduce the stack usage by recursive call of snd_hda_get_conn_index() or parse_nid_path() of the generic parser. The list management doesn't include any mutex protection, thus the caller needs to take care of race appropriately. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Add inv_eapd flag to struct hda_codecTakashi Iwai1-0/+2
Add the new flag, codec->inv_eapd, indicating that the EAPD implementation is inverted. There are always broken hardware in the world. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Implement independent HP controlTakashi Iwai1-1/+129
Similar like the implementation in patch_analog.c and patch_via.c, the generic parser can provide the independent HP PCM stream now. It's enabled when spec->indep_hp is set by the caller while parsing. Currently no dynamic PCM switching as in patch_via.c is implemented yet. The control returns -EBUSY when the value is changed during PCM operations. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Allow aamix in the primary output pathTakashi Iwai1-0/+7
Allow the path including the loopback mixer widget in the primary output channel as an alternative in the generic codec parser. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Define HDA_PARSE_* for snd_hda_parse_nid_path() argumentTakashi Iwai1-13/+15
... instead of numbers. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Fix typos in debug_show_configs()Takashi Iwai1-2/+2
It never showed the 4th line out and headphone pins since quite ago. Oh well. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Add more debug prints about new pathsTakashi Iwai1-10/+36
Add a better debug print code to show the new assigned paths in generic parser. It appears only with CONFIG_SND_DEBUG_VERBOSE=y. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Drop spec->channel_mode field from hda_gen_specTakashi Iwai1-10/+0
It's never used in the generic parser. It was there from the old Realtek code, which has been dropped quite ago, too. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Fix PCM name string for generic parserTakashi Iwai1-5/+27
When a PCM name string is generated from the chip name, it might become strange like "CX20549 (Venice) Analog". In this patch, the parser tries to drop the invalid words like "(Venice)" in the PCM name string. Also, when the name string is given beforehand by the caller, respect it and use it as is. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Use cached version for changing pins in hda_generic.cTakashi Iwai1-5/+6
There is no reason to avoid snd_hda_set_pin_ctl_cache() there. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Dynamically turn on/off EAPD in generic codec driverTakashi Iwai1-6/+16
When spec->own_eapd_ctl isn't set, try to turn on/off EAPD on demand for each pin. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Fix initialization of primary outputs in hda_generic.cTakashi Iwai1-6/+9
There were some old codes that look not stable enough, which was derived from the old Realtek code. The initialization for primary output in init_multi_out() needs to consider the case of shared DAC. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Refactor init_extra_out() in hda_generic.cTakashi Iwai1-25/+24
Just a small clean up by splitting a function. No functional changes at all. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Clear unsol enable bits on unused pins in generic parserTakashi Iwai1-0/+19
For preliminary works to migrate the generic parser for Conexant codecs: the same function is ported to hda_generic.c. But now it looks through the jack detect table so that it can cover better. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Add spec->vmaster_mute_enum flag to generic parserTakashi Iwai1-1/+2
Add a flag to indicate whether the vmaster mute hook enum is exposed or not. Conexant codecs may want not to expose the control depending on the model. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Do sequential writes in snd_hda_gen_init()Takashi Iwai1-0/+5
This would reduce the number of actually executed verbs. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Add / fix comments about capture vol/sw controls in hda_generic.cTakashi Iwai1-5/+10
A bit of details won't hurt. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Add missing amp cache flush for bound capture vol/sw ctlsTakashi Iwai1-0/+1
The bound capture volume and switch controls use the cached amp updates, but it's missing the flushing at the end. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Use "Capture Source" for single sourcesTakashi Iwai1-1/+3
In general we prefer "Capture Source" to "Input Source". The latter was chosen in many places just because "Capture Source" label doesn't work well with the current alsa-lib mixer abstraction when multiple instances are present. But when we know that there is a single input-source element, we can safely choose "Capture Source" label. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Export standard jack event handlers for generic parserTakashi Iwai1-11/+15
These handlers are supposed to be called externally from the codec drivers once when they need to handle own jack events. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Fix NULL dereference in snd_hda_gen_build_controls()Takashi Iwai1-3/+5
When no controls are assigned in the parser (e.g. no analog path), spec->kctls.list is still NULL. We need to check it before passing to snd_hda_add_new_ctls(). Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-01-12ALSA: hda - Move the call of snd_hda_parse_pin_defcfg() from ↵Takashi Iwai1-9/+15
snd_hda_gen_parse_auto_config() In some cases, we want to manipulate the auto_pin_cfg table before passing to snd_hda_gen_parse_auto_config() (e.g. Realtek SSID check code fiddles with the headphone pin). Also passing ignore_pins just for snd_hda_parse_pin_defcfg() isn't good. In this patch, snd_hda_gen_parse_auto_config() is changed to receive the auto_pin_cfg table to be parsed. The passed auto_pin_cfg table must have been initialized (typically by calling snd_hda_gen_parse_auto_config()) beforehand by the caller. Also together with this change, spec->parse_flags is also removed. Since this was referred only at the place calling snd_hda_parse_pin_defcfg(), no longer needed to be kept in spec. Signed-off-by: Takashi Iwai <tiwai@suse.de>