aboutsummaryrefslogtreecommitdiff
path: root/sound/pci
AgeCommit message (Collapse)AuthorFilesLines
2013-01-12ALSA: hda - Add helper functions to cache the current pinctl targetTakashi Iwai3-2/+33
We already have the list of whole pin widgets and there is an unused space in the list; let's use it for caching the current pinctl value. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-12ALSA: hda - Clear the dropped paths properlyTakashi Iwai1-1/+15
When a DAC is reassigned from surrounds to front or ADCs are reduced due to incomplete imux, we clear the path indices but the path instances remain as is. Since the paths might be still referred through the whole path list parsing (e.g. is_active_nid()), we should clear these path instances as well. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-12ALSA: hda - Allow aamix as a capture sourceTakashi Iwai2-25/+45
Since some codecs can choose the aamix as a capture source, we should support it as well. When spec->add_stereo_mix_input flag is set, the parser checks the availability of aamix as the input source, and adds the paths automatically when possible. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-12ALSA: hda - Fix inconsistent input_paths after ADC reductionTakashi Iwai1-12/+22
In the current parser code, the input_paths[] may become inconsistent when some of detected ADCs are dropped due to incomplete inputs, since the driver rearranges only adc_nids[] but doesn't touch input_paths[]. This patch fixes the issue, and also it optimizes the reachability checks by simply referring to the parsed input_paths[] instead of calling is_reachable() again for each connection. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-12ALSA: hda - Return "Headphone Mic" from hda_get_autocfg_input_label()Takashi Iwai2-4/+2
Instead of handling special cases in the caller side, give a proper name string "Headphone Mic" from hda_get_autocfg_input_label() when the headhpone jack pin is specified as an input. Signed-off-by: Takashi Iwai <[email protected]>
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 <[email protected]>
2013-01-12ALSA: hda - Add a flag to suppress mic auto-switchTakashi Iwai2-0/+4
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 <[email protected]>
2013-01-12ALSA: hda - Handle BOTH jack port as a fixed outputTakashi Iwai1-1/+2
When the default config value shows the connection AC_JACK_PORT_BOTH, it's better to handle it as a speaker pin. This makes the behavior consistent in snd_hda_get_pin_label() and snd_hda_parse_pin_defcfg(). There are only few old machines showing this attribute, and all of them are actually fixed speaker pins, as far as I know. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-12ALSA: hda - Re-define snd_hda_parse_nid_path()Takashi Iwai2-57/+57
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 <[email protected]>
2013-01-12ALSA: hda - Manage input paths via path indicesTakashi Iwai2-26/+19
... like we did for output and loopback paths. It makes the code slightly easier. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-12ALSA: hda - Fix multi-io channel mode managementTakashi Iwai2-32/+76
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 <[email protected]>
2013-01-12ALSA: hda - Don't set up active streams twiceTakashi Iwai1-2/+2
We don't have to set up a stream that has been already set up previously. Signed-off-by: Takashi Iwai <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
2013-01-12ALSA: hda - Add brief comments to exported snd_hda_gen_*_() functionsTakashi Iwai1-1/+12
Signed-off-by: Takashi Iwai <[email protected]>
2013-01-12ALSA: hda - Remove dead HDA_CTL_BIND_VOL and HDA_CTL_BIND_SW codesTakashi Iwai1-4/+0
Signed-off-by: Takashi Iwai <[email protected]>
2013-01-12ALSA: hda - Add snd_hda_gen_free() and snd_hda_gen_check_power_status()Takashi Iwai3-26/+24
Just to remove duplicated codes. Also fixed EXPORT_SYMBOL() in hda_generic.c. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-12ALSA: hda - Allow jack detection when polling is enabledTakashi Iwai1-1/+2
Let is_jack_detectable() return true when the jack polling is enabled for the codec. VT1708 uses the polling explicitly so we need to allow it. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-12ALSA: hda - Add pcm_playback_hook to hda_gen_specTakashi Iwai2-5/+74
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 <[email protected]>
2013-01-12ALSA: hda - Drop bind-volume workaroundTakashi Iwai2-100/+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 <[email protected]>
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 <[email protected]>
2013-01-12ALSA: hda - Add missing slave names for Speaker Surround, etcTakashi Iwai1-0/+3
Signed-off-by: Takashi Iwai <[email protected]>
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 <[email protected]>
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 <[email protected]>
2013-01-12ALSA: hda - Add Loopback Mixing controlTakashi Iwai2-0/+110
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 <[email protected]>
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 <[email protected]>
2013-01-12ALSA: hda - Initialize digital-input path properlyTakashi Iwai2-1/+8
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 <[email protected]>
2013-01-12ALSA: hda - Manage using output/loopback path indicesTakashi Iwai2-50/+98
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
2013-01-12ALSA: hda - Check the existing path in snd_hda_add_new_path()Takashi Iwai2-7/+25
If the requested path has been already added, return the existing path instance instead of adding a duplicated instance. Signed-off-by: Takashi Iwai <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
2013-01-12ALSA: hda - Add hooks for HP/line/mic auto switchingTakashi Iwai2-0/+14
... as a preliminary work for migrating patch_sigmatel.c. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-12ALSA: hda - Revive snd_hda_get_conn_list()Takashi Iwai3-70/+106
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 <[email protected]>
2013-01-12ALSA: hda - Add codec->inv_jack_detect flagTakashi Iwai2-1/+6
Yet another broken hardware workaround: there are hardware indicating the inverted jack detection bit result. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-12ALSA: hda - Add inv_eapd flag to struct hda_codecTakashi Iwai2-0/+3
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 <[email protected]>
2013-01-12ALSA: hda - Implement independent HP controlTakashi Iwai2-1/+138
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 <[email protected]>
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 <[email protected]>
2013-01-12ALSA: hda - Define HDA_PARSE_* for snd_hda_parse_nid_path() argumentTakashi Iwai2-13/+22
... instead of numbers. Signed-off-by: Takashi Iwai <[email protected]>
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 <[email protected]>
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 <[email protected]>
2013-01-12ALSA: hda - Drop spec->channel_mode field from hda_gen_specTakashi Iwai2-12/+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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.