aboutsummaryrefslogtreecommitdiff
path: root/sound/pci
AgeCommit message (Collapse)AuthorFilesLines
2013-01-21ALSA: hda - Improve debug prints for output pathsTakashi Iwai1-11/+46
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 <[email protected]>
2013-01-19ALSA: hda - Add fixup for Acer AO725 laptopTakashi Iwai1-0/+1
Acer AO725 needs the same fixup as AO756. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=52181 Signed-off-by: Takashi Iwai <[email protected]>
2013-01-18ALSA: hda/conexant - Set mixer NID 0x19 for CX20551 codecTakashi Iwai1-0/+7
Conexant CX20551 codec has a mixer in NID 0x19 and a few outputs have to take the input through this widget. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-18ALSA: hda - Correct more array rooms in hda_gen_specTakashi Iwai1-4/+4
Looking through the whole definitions, some fields have inappropriate array sizes, especially about the capture. The array assigned to each input (pin) should have HDA_MAX_NUM_INPUTS entries while the array assigned to each ADC should have AUTO_CFG_MAX_INS entries. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-18ALSA: hda - Fix the wrong adc_idx for capture sourceTakashi Iwai1-2/+3
The patch "ALSA: hda - fix wrong adc_idx in generic parser" fixed the adc_idx for the capture volume and capture switch controls. But also modified the adc_idx retrieval for the capture source controls wrongly. As multiple capture source controls are created in a single shot with counts > 1, the id.index doesn't contain the real value. The real index has to be taken via snd_ctl_get_ioffidx() as in the original code. This patch reverts the fixes partially to recover from the regression. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-18ALSA: hda - Don't add unnecessary indices on HDMI and SPDIFDavid Henningsson1-10/+16
If there's one each of HDMI and SPDIF, we should not add an index on the one that comes second. [slight code refactoring by tiwai] Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-01-18ALSA: hda - don't compare with yourself in fill_input_pin_labelsDavid Henningsson1-1/+1
Just stumbled over this one while reading the code. Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-01-18ALSA: hda - make sure there are enough input labels and pathsDavid Henningsson2-4/+4
I found a codec configuration which had six inputs, so the max of five was not appropriate. Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-01-18ALSA: hda - Fix speaker pin of FSC Lifebook S7110 laptopTakashi Iwai1-1/+11
Some BIOS version of FSC Lifebook S7110 laptop seems to give a wrong default pin config for NID 0x15, which confuses the parser. Give a fixup to correct the value. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-18ALSA: hda - Add boost to line inputs, tooTakashi Iwai1-1/+1
Although I commented that boost volumes would be added only for line-in and mic pins in the source code, the actual code excludes but for mic-in. Fix it to accept the line-ins, too. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-18ALSA: hda/sigmatel - Add bass speaker support for HP ENVY Spectre XTTakashi Iwai1-0/+11
The pin configuration for the bass speaker needs to be corrected in a fixup. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-18ALSA: hda - Consolidate cap_sync_hook and capture_switch_hookTakashi Iwai4-33/+22
Two hooks in hda_gen_spec, cap_sync_hook and capture_switch_hook, play very similar roles. The only differences are that the former is called more often (e.g. at init or switching capsrc) while the latter can take an on/off argument. As a more generic implementation, consolidate these two hooks, and pass snd_ctl_elem_value pointer as the second argument. If the secondary argument is non-NULL, it can take the on/off value, so the caller handles it like the former capture_switch_hook. If it's NULL, it's called in the init or capsrc switch case. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-18ALSA: hda - Fix missing call of capture_switch_hookTakashi Iwai1-15/+46
When a standard capture switch without multiple binding is used, the call for capture_switch_hook isn't called properly. Replace the put ops to add the hook call in that case. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-18ALSA: hda - Fix mute led for another HP machineDavid Henningsson1-0/+1
This machine also has the "HP_Mute_LED_0_A" string in DMI information. Cc: <[email protected]> BugLink: https://bugs.launchpad.net/bugs/1096789 Tested-by: Tammy Yang <[email protected]> Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-01-18ALSA: hda - Look for boost controls more deeplyTakashi Iwai1-24/+77
In the current generic parser code, we look for the (mic) boost controls only on input pins. But many codecs assign the boost volume to a widget connected to each input pin instead of the input amp of the pin itself. In this patch, the parser tries to look through more widgets connected to the pin and find a boost amp. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-18ALSA: hda - Fix invalid mute in path activationTakashi Iwai1-18/+42
When an amp in the activation path is associated with mixer controls, activate_amp() tries to skip the initialization. It's good, but only if the mixer really initializes both mute and volume. Otherwise, either the mute of the volume is left uninitialized. This patch adds this missing check and properly initialize the partially controlled amps in an activation path. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-18ALSA: hda - Unify input label creations in generic parserTakashi Iwai2-37/+56
There are a few places creating the labels and indices of kctls for each input pin in the current generic parser code. This is redundant and makes harder to maintain. Let's create the labels and indices at once and keep them in hda_gen_spec. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-18ALSA: hda - Keep autocfg.input idx value in imux tableTakashi Iwai1-6/+14
Since the imux table entries can be a subset of autocfg.input table, the indices of these aren't always same. For passing the proper index value of autocfg.input at creating input ctl labels (via snd_hda_autocfg_input_label()), keep the corresponding autocfg.input idx value in the index field of each imux item, which isn't used in the generic driver. Also, this makes easier to check the invalid imux pin for stereo mix. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-18ALSA: hda - Fix missing unsol event handler in some codec driversTakashi Iwai3-0/+3
This resulted in non-working auto-mute behavior, of course... Signed-off-by: Takashi Iwai <[email protected]>
2013-01-17ALSA: hda - Use generic parser for STAC/IDT codec driverTakashi Iwai2-3951/+769
Finally we reached here. All codecs driver (except for CA0132, which has really device-specific requirements) have been converted to use the generic parser. This patch appears bigger than others since it also involves with the code shuffling, but mostly the cut-off of parser codes and adapt to the generic parser flags. Most of fixup codecs haven't been changed but just removed a few unnecessary codes. The only missing stuff is the SPDIF mux control. It'll be added again later. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-17Merge branch 'test/hda-gen-parser' into test/hda-migrateTakashi Iwai2-35/+315
* test/hda-gen-parser: ALSA: hda - Improve naming rule for primary output ALSA: hda - Add PCM capture hook to hda_gen_spec ALSA: hda - Record all detected ADCs in hda_gen_spec ALSA: hda - Move vmaster TLV parsing to snd_hda_gen_parse_auto_config() ALSA: hda - Add input jack mode enum controls to generic parser ALSA: hda - Give more comments to hda_gen_spec flags ALSA: hda - Add suppress_auto_mute flag to hda_gen_spec ALSA: hda - Record the current speaker / LO mute status in hda_gen_spec ALSA: hda - Properly call automute/switch hooks at init
2013-01-17ALSA: hda - Improve naming rule for primary outputTakashi Iwai1-17/+42
When the volume or mute control of the primary output is shared with other (headphone or speaker) outputs, we shouldn't name it as a specific output type but rather name it with the channel name or a generic name like "PCM". Also, this check should be performed individually for the volume and the mute controls because some codecs may have shared volumes but separate mute controls. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-17ALSA: hda - Add PCM capture hook to hda_gen_specTakashi Iwai2-1/+68
Not only PCM playback, a hook for PCM capture would be required for power controls in codec drivers. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-17ALSA: hda - Record all detected ADCs in hda_gen_specTakashi Iwai2-1/+8
Since the generic parser reduces the ADC list, copy the list of the all detected ADCs and keep it. This list can be later referred by the codec driver for finer power controls. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-17ALSA: hda - Move vmaster TLV parsing to snd_hda_gen_parse_auto_config()Takashi Iwai2-4/+5
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 <[email protected]>
2013-01-17ALSA: hda - Add input jack mode enum controls to generic parserTakashi Iwai2-0/+141
Just like the jack mode enum ctls for output jacks, add the support for similar enum ctls for input pins to control the bias Vref. The new controls will be added when spec->add_in_jack_modes is set either by the codec driver or by a hint string. Note that ground and 100% vrefs are excluded from the list for simplicity, currently. We may add a new flag to allow them, too. But I guess it's easier to put a value override in the pinfix in such a case. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-17ALSA: hda - Minor cleanup/fixes for patch_sigmatel.c fixup transitionTakashi Iwai1-27/+13
- spec->hp_detect has to be overridden in HDA_FIXUP_ACT_PARSE, not in PRE_PARSE. - Remove err == 0 check but return directly -EINVAL from stac92xx_parse_auto_config() - Set spec->default_polarity for 92HD71bxx - Some code shuffles Signed-off-by: Takashi Iwai <[email protected]>
2013-01-16ALSA: hda - Give more comments to hda_gen_spec flagsTakashi Iwai1-8/+19
Since we have many bit flags in hda_gen_spec, rearrange in sections and give more comments there. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-16ALSA: hda - Add suppress_auto_mute flag to hda_gen_specTakashi Iwai2-0/+7
A new flag to skip the auto-mute handling in the generic parser, just like suppress_auto_mic flag. It has to be set before calling snd_hda_gen_parse_auto_config(). Signed-off-by: Takashi Iwai <[email protected]>
2013-01-16ALSA: hda - Record the current speaker / LO mute status in hda_gen_specTakashi Iwai2-0/+4
... to be referred by the codec driver. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-16ALSA: hda - Properly call automute/switch hooks at initTakashi Iwai1-6/+23
... and a little bit of code refactoring. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-16Merge branch 'test/hda-gen-parser' into test/hda-migrateTakashi Iwai5-16/+80
* test/hda-gen-parser: ALSA: hda - Make sure fill_all_dac_nids is called for digital only codecs ALSA: hda - force different capture controls if amp caps differ ALSA: hda - do not add non-existing Mic boost controls ALSA: hda - initialize channel counts correctly ALSA: hda - fix wrong adc_idx in generic parser ALSA: hda - Check array bounds in get_input_path ALSA: hda - Add prefer_hp_amp flag to hda_gen_spec ALSA: hda - fix OOPS in hda_mark_cmd_cache_dirty ALSA: hda - Check pincap while parsing the configuration
2013-01-16ALSA: hda - Make sure fill_all_dac_nids is called for digital only codecsDavid Henningsson1-2/+2
Otherwise no PCM will be built for codecs without analog I/O. Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-01-16ALSA: hda - force different capture controls if amp caps differDavid Henningsson1-3/+21
Otherwise setting the capture volume for amps will be weird and inconsistent (it will try to set values outside the range of the second amp based on capabilities of the first amp). Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-01-16ALSA: hda - do not add non-existing Mic boost controlsDavid Henningsson1-0/+3
If the input node does not have any volume capable input amp, don't add such a control. Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-01-16ALSA: hda - initialize channel counts correctlyDavid Henningsson1-1/+1
Even a single DAC can output two channels, so the channel count is twice the number of DACs. Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-01-16ALSA: hda - fix wrong adc_idx in generic parserDavid Henningsson1-3/+3
We use knew->index for adc_idx when we create "Capture Volume" and "Capture Switch", so use the same to retrieve adc_idx. Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-01-16ALSA: hda - Check array bounds in get_input_pathDavid Henningsson1-0/+8
This gives us some additional safety. Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-01-16ALSA: hda/ca0132 - Make some symbols staticTakashi Iwai1-2/+2
sound/pci/hda/patch_ca0132.c:387:19: sparse: symbol 'ca0132_voicefx' was not declared. Should it be static? Reported-by: Fengguang Wu <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-01-16ALSA: hdsp - Remove obsolete settings functionsAdrian Knoth1-339/+0
With HDSP_TOGGLE_SETTING in place, these functions are no longer required. Removing them makes the code DRY and considerably shorter. Signed-off-by: Adrian Knoth <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-01-16ALSA: hdsp - Use HDSP_TOGGLE_SETTING to alter settingsAdrian Knoth1-15/+28
HDSP_TOGGLE_SETTING and its corresponding functions allow to change settings in the control register. Instead of using the specialised functions, use the generic code to make the code DRY. Signed-off-by: Adrian Knoth <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-01-16ALSA: hdsp - Implement generic function to toggle settingsAdrian Knoth1-0/+59
The driver contains multiple similar functions that change only a single bit in the control register, only the bit position varies. This patch implements a generic function to toggle a certain bit position that will be used to replace the old code. Signed-off-by: Adrian Knoth <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-01-16ALSA: hdsp - Fix detection for RME RPM/Multiface/Digiface ioboxesAdrian Knoth1-26/+65
The current iobox detection code reportedly fails for various users, so simply do what the Win32 driver does instead. Patch originally by Karl Grill <[email protected]> and then modified to comply with kernel coding guidelines + current HEAD. Signed-off-by: Adrian Knoth <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-01-15ALSA: hda - Add prefer_hp_amp flag to hda_gen_specTakashi Iwai3-6/+16
Add a new flag to indicate whether HP amp is turned on as default for speaker or line-outs, and enable this for ALC260 codec, as many machines with this codec require the HP amp even for speakers. Signed-off-by: Takashi Iwai <[email protected]>
2013-01-15ALSA: hda/ca0132 - Fix a wrong comma in snd_printdd() callTakashi Iwai1-1/+1
sound/pci/hda/patch_ca0132.c: In function ‘ca0132_effects_set’: sound/pci/hda/patch_ca0132.c:3391:2: warning: too many arguments for format [-Wformat-extra-args] Signed-off-by: Takashi Iwai <[email protected]>
2013-01-15ALSA: hda/ca0132 - Declare firmware only when really builtTakashi Iwai1-0/+2
Signed-off-by: Takashi Iwai <[email protected]>
2013-01-15ALSA: hda/ca0132 - Fix possible invalid DMA channel deallocationTakashi Iwai1-3/+3
... in the error path in dspxfr_image(). Signed-off-by: Takashi Iwai <[email protected]>
2013-01-15ALSA: hda/ca0132 - Fix possible NULL dereferenceTakashi Iwai1-6/+4
Spotted by smatch, sound/pci/hda/patch_ca0132.c:1950 dspxfr_image() error: potential null dereference 'dma_engine'. (kzalloc returns null) sound/pci/hda/patch_ca0132.c:1950 dspxfr_image() error: we previously assumed 'dma_engine' could be null (see line 1857) Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-01-15ALSA: hda/ca0132 - Fix another smatch warningTakashi Iwai1-1/+1
sound/pci/hda/patch_ca0132.c:1781 dspxfr_one_seg() info: why not propagate 'status' from dsp_dma_stop() instead of (-5)? Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-01-15ALSA: hda/ca0132 - Fix superfluous unsigned checkTakashi Iwai1-1/+1
Fix a warning by smatch, sound/pci/hda/patch_ca0132.c:714 dspio_send() warn: always true condition '(res >= 0) => (0-u32max >= 0)' Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>