aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* ALSA: hda: minor code cleanupsWu Fengguang2008-11-19
| | | | | | | Some minor code cleanups. Signed-off-by: Wu Fengguang <wfg@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: hda: EAPD mute on suspendMatthew Ranostay2008-11-19
| | | | | | | | Moved support for EAPD mute on suspend from stac92hd71xx_suspend to the generic stac92xx_suspend function. Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: hda: HDMI channel mapping cleanupsWu Fengguang2008-11-19
| | | | | | | | Refactor the channel mapping code for consistent naming and make it more informed about channel allocations. Signed-off-by: Wu Fengguang <wfg@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: hda: HDMI channel allocations for audio infoframeWu Fengguang2008-11-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To play a 3+ channels LPCM/DSD stream via HDMI, - HDMI sink must tell HDMI source about its speaker placements (via ELD, speaker-allocation field) - HDMI source must tell the HDMI sink about channel allocation (via audio infoframe, channel-allocation field) (related docs: HDMI 1.3a spec section 7.4, CEA-861-D section 7.5.3 and 6.6) This patch attempts to set the CA(channel-allocation) byte in the audio infoframe according to - the number of channels in the current stream - the speakers attached to the HDMI sink A channel_allocations[] line must meet the following two criteria to be considered as a valid candidate for CA: 1) its number of allocated channels = substream->runtime->channels 2) its speakers are a subset of the available ones on the sink side If there are multiple candidates, the first one is selected. This simple policy shall cheat the sink into playing music, but may direct data to the wrong speakers. Signed-off-by: Wu Fengguang <wfg@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: hda: make global snd_print_channel_allocation()Wu Fengguang2008-11-19
| | | | | | | code refactor: make a global function snd_print_channel_allocation(). Signed-off-by: Wu Fengguang <wfg@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: hda: make standalone hdmi_fill_audio_infoframe()Wu Fengguang2008-11-19
| | | | | | | code refactor: make a standalone function hdmi_fill_audio_infoframe(). Signed-off-by: Wu Fengguang <wfg@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: hda - Allow multiple imux for matrix-type mixers of ALC codecsTakashi Iwai2008-11-18
| | | | | | | | Allow the multiple imux instances for matrix-type mixers like ALC882. So far, only ALC260 used this feature, but other codecs may need a similar stuff. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* Merge branch 'topic/fix/hda' into topic/hdaTakashi Iwai2008-11-18
|\
| * ALSA: hda - Fix resume of GPIO unsol event for STAC/IDTTakashi Iwai2008-11-18
| | | | | | | | | | | | | | Use cached write for setting the GPIO unsolicited event mask to be restored properly at resume. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: hda - Add quirks for HP Pavilion DV modelsTakashi Iwai2008-11-18
| | | | | | | | | | | | | | | | | | | | Added the quirk entries for HP Pavilion DV5 and DV7 with model=hp-m4. Reference: Novell bnc#445321, bnc#445161 https://bugzilla.novell.com/show_bug.cgi?id=445321 https://bugzilla.novell.com/show_bug.cgi?id=445161 Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: hda - Fix GPIO initialization in patch_stac92hd71bxx()Takashi Iwai2008-11-18
| | | | | | | | | | | | | | Fixed the GPIO mask and co initialization in patch_stac92hd71bxx() so that the gpio_maks for HP_M4 model is set properly. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: hda - Check model type instead of SSID in patch_92hd71bxx()Takashi Iwai2008-11-15
| | | | | | | | | | | | | | | | Check board preset model instead of codec->subsystem_id in patch_92hd71bxx() so that other hardwares configured via the model option work like the given model. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: hda - Fix restore of pin configs at resume for STAC/IDT codecsTakashi Iwai2008-11-18
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the restore of pin configs at resume for some STAC/IDT codec models. These models set explicitly the pin configs after the default init configs, and these aren't restored properly at resume. This patch introduces two changes: - Allocate always pin_configs array in stac_spec so that the driver can overwrite the value freely - Introduce stac_change_pin_config() to change the pin config value Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: hda - Use init callback in stac92xx_resume()Takashi Iwai2008-11-18
| | | | | | | | | | | | | | Call the init callback and remove duplicated codes in stac92xx_resume(). This also fixes the missing initialization such as digital I/O pins. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: hda - Create jack detection elements in build_controlsTakashi Iwai2008-11-18
| | | | | | | | | | | | | | | | The jack detection input elements should be created in build_controls callback instead of init callback because init can be called multiple times by suspend/resume and power-saving. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: ELD proc interface for HDMI sinksWu Fengguang2008-11-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create /proc/asound/card<card_no>/eld#<codec_no> to reflect the audio configurations and capabilities of the attached HDMI sink. Some notes: - Shall we show an empty file if the ELD content is not valid? Well it's not that simple. There could be partially populated ELD, and there may be malformed ELD provided by buggy drivers/monitors. So expose ELD as it is. - The ELD retrieval routines rely on the Intel HDA interface, others are/could be universal and independent ones. - How do we name the proc file? If there are going to be two HDMI pins per codec, then the current naming scheme (eld#<codec no>) will fail. Luckily the user space dependencies should be minimal, so it would be trivial to do the rename if that happens. - The ELD proc file content is designed to be easy for scripts and human reading. Its lines all have the pattern: <item_name>\t[\t]*<item_value> where <item_name> is a keyword in c language, while <item_value> could be any contents, including white spaces. <item_value> could also be a null value. Signed-off-by: Wu Fengguang <wfg@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: create hda_eld.c for ELD routines and proc interfaceWu Fengguang2008-11-18
| | | | | | | | | | | | | | | | ELD handling routines can be shared by all HDMI codecs, and they are large enough to make a standalone source file. Signed-off-by: Wu Fengguang <wfg@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: introduce snd_print_pcm_rates()Wu Fengguang2008-11-18
| | | | | | | | | | | | | | | | We want to share some code with print_pcm_rates(), so extract a common routine snd_print_pcm_rates() from it. Signed-off-by: Wu Fengguang <wfg@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: hda: remove redundant get_amp_nid()Wu Fengguang2008-11-18
| | | | | | | | | | | | | | Remove get_amp_nid(): it duplicates the one defined in hda_local.h Signed-off-by: Wu Fengguang <wfg@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: hda-intel: reorder HDMI audio enabling sequenceWu Fengguang2008-11-17
| | | | | | | | | | | | | | | | | | | | | | | | | | Reorder HDMI audio enabling sequence so that 1) the sink knows about the coming audio stream 2) unmute 3) start transferring audio samples The theory is that in the path A=>B=>C, we first make C ready, and then enable B, and lastly allow A to send audio samples. Signed-off-by: Wu Fengguang <wfg@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: hda: STAC_DELL_M6 EAPDMatthew Ranostay2008-11-17
| | | | | | | | | | | | | | | | Add support for EAPD on system suspend and disabling EAPD on headphone jack detection for STAC_DELL_M6 laptops. Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: hda: alc883 model for ASUS P5Q-EM boardsWu Fengguang2008-11-17
| | | | | | | | | | | | | | | | | | | | Add a new alc883 model ALC1200_ASUS_P5Q for ASUS P5Q-EM boards. It is the same as ALC883_6ST_DIG except that the SPDIF digital output nid is 0x10. Tested-by: Andrei Tanas <andrei@tanas.ca> Signed-off-by: Wu Fengguang <wfg@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | Merge branch 'topic/fix/hda' into topic/hdaTakashi Iwai2008-11-15
|\| | | | | | | | | Conflicts: sound/pci/hda/patch_sigmatel.c
| * ALSA: hda: STAC_VREF_EVENT value changeMatthew Ranostay2008-11-15
| | | | | | | | | | | | | | | | | | Changed value for STAC_VREF_EVENT from 0x40 to 0x00 because the unsol response value is only 6-bits width and the former value was 1<<6 which is an overrun. Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: hda - Support Headphone and Speaker volumes control on VAIOTakashi Iwai2008-11-14
| | | | | | | | | | | | | | | | Split the bound Master control to individual Headphone and Speaker volume controls for VAIO with STAC982x codecs. The Master controls is still created as a vmaster. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | Merge branch 'topic/fix/hda' into topic/hdaTakashi Iwai2008-11-13
|\| | | | | | | | | Conflicts: sound/pci/hda/patch_sigmatel.c
| * ALSA: hda - Missing NULL check in hda_beep.cTakashi Iwai2008-11-13
| | | | | | | | | | | | Added a NULL check of input_allocate_device() in hda_beep.c. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: hda - Add digital beep playback switch for STAC/IDT codecsTakashi Iwai2008-11-13
| | | | | | | | | | | | | | | | | | | | | | | | | | The digital beep widget may have no mute control, and always enabling the beep is ofen pretty annoying, especially on laptops. This patch adds a mixer control "PC Beep Playback Switch" when there is no mixer amp mute is found, and controls it on software. Reference: Novell bnc#444572 https://bugzilla.novell.com/show_bug.cgi?id=444572 Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: hda - support detecting HD Audio devices with PCI class codeYang, Libin2008-11-13
| | | | | | | | | | | | | | The patch uses HD Audio PCI class code to detect AMD HD Audio cards. Signed-off-by: Libin Yang <libin.yang@amd.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: handle SiI1392 HDMI codec in patch_intelhdmi.cWu Fengguang2008-11-13
| | | | | | | | | | | | | | | | Move the handling of SiI1392 HDMI codec from patch_atihdmi.c to patch_intelhdmi.c, which makes our ASUS P5E-VM HDMI board work. Signed-off-by: Wu Fengguang <wfg@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | Merge branch 'topic/fix/hda' into topic/hdaTakashi Iwai2008-11-12
|\| | | | | | | | | Conflicts: sound/pci/hda/patch_sigmatel.c
| * ALSA: hda - Fix IDT/STAC multiple HP detectionTakashi Iwai2008-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the recent change for multiple HP as line-out switch, only one of the multiple headphons (usually a wrong one) is toggled and the other pins are still disabled. This causes the silent output problem on some Dell laptops. Also, the hp_switch check is screwed up when a line-in or a mic-in jack exists. This is added as an additional output, but hp_switch check doesn't take it into account. This patch fixes these issues: simplify hp_switch check by using the NID instead of bool, and clean up / fix the toggle of HP pins in unsol event handler code. Reference: Novell bnc#443267 https://bugzilla.novell.com/show_bug.cgi?id=443267 Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: hda - Fix input pin initialization for STAC/IDT codecsTakashi Iwai2008-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The input pins are sometimes not initialized properly because of the optimization check of the current pinctl code. Force to initialize the mic input pins so that they can be set up properly even if they were in a weird state. But keep other input pins if already set up as input, since this could be an extra mic pin. Reference: Novell bnc#443738 https://bugzilla.novell.com/show_bug.cgi?id=443738 Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: hda - Add missing analog-mux mixer creation for STAC9200Takashi Iwai2008-11-11
| | | | | | | | | | | | | | The creation of analog-mux mixer element is missing in patch_stac9200() due to the dynamic allocation patch. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: hda - Make the HP EliteBook 8530p use AD1884A model laptopTravis Place2008-11-10
| | | | | | | | | | | | | | | | | | Added a QUIRK to patch_analog.c for the HP Elitebook 8530p (IDs 0x103c:0x30e7) to use AD1884A model 'laptop' by default. Playback and Capture confirmed working. Signed-off-by: Travis Place <wishie@wishie.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: hda - Add another HP model (6730s) for AD1884AMichel Marti2008-11-09
| | | | | | | | | | | | | | | | Added model=laptop for another HP machine (103c:3614) with AD1884A codec. Signed-off-by: Michel Marti <mma@objectxp.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: hda - Fix another cache list managementTakashi Iwai2008-11-10
| | | | | | | | | | | | Fix another silly bug in the amp cache list management. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: hda - Fix probe errors on Dell Studio DesktopTakashi Iwai2008-11-07
| | | | | | | | | | | | | | | | | | BIOS on Dell Studio Desktop tells wrong codec probe masks. This patch gives the preset mask value to avoid invalid access. Reference: Novell bug#440907 https://bugzilla.novell.com/show_bug.cgi?id=440907 Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: hda - Fix ALC260 hp3013 master switchTakashi Iwai2008-11-07
| | | | | | | | | | | | | | | | | | | | | | The master switch doesn't influence on NID 0x15, the headphone jack on HP 3013 model because alc260_hp_master_update() ignores the passed arguments. Also, corrected the wrong arguments of hp3013 (0x10 and 0x15) although this doesn't change any behavior. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | Merge branch 'topic/fix/hda' into topic/hdaTakashi Iwai2008-11-07
|\|
| * ALSA: hda - Add a quirk for MEDION MD96630Takashi Iwai2008-11-05
| | | | | | | | | | | | | | | | | | Use model=lenovo-ms7195-dig for MEDION MD96630 laptop (17c0:4085) with ALC888 codec. Reference: Novell bnc#412548 https://bugzilla.novell.com/show_bug.cgi?id=412528 Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: hda - Limit the number of GPIOs show in procTakashi Iwai2008-11-04
| | | | | | | | | | | | | | Limit the number of GPIOs shown in proc. Otherwise it gets too long unnecessarily, and hard to analyze. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: hda: make a STAC_DELL_EQ optionMatthew Ranostay2008-11-03
| | | | | | | | | | | | | | | | | | Add support for explicitly enabling the EQ distortion hack for systems without software biquad support. Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com> Cc: stable@kernel.org Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: hda - Add a quirk for another Acer Aspire (1025:0090)Takashi Iwai2008-11-03
| | | | | | | | | | | | | | | | Added a quirk for another Acer Aspier laptop (1025:0090) with ALC883 codec. Reported in Novell bnc#426935: https://bugzilla.novell.com/show_bug.cgi?id=426935 Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: hda - Fix broken hash chain allocationTakashi Iwai2008-11-06
| | | | | | | | | | | | | | The chaining for amp hash got broken due to the rewrite with snd_array. Fixed now. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: hda - Add max allocation check in array allocatorTakashi Iwai2008-11-06
| | | | | | | | | | | | | | Added a check for max allocation size in snd_array_new() for a debugging purpose. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: hda - Add missing NULL check in amp hash allocationTakashi Iwai2008-11-06
| | | | | | | | | | | | Added the missing NULL check from allocator in get_alloc_hash(). Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: hda - Add lifebook model for Realtek ALC269Tony Vroon2008-11-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The widget layout of the Fujitsu Lifebook S6420 (which is ICH9M-based and uses an ALC269) is similar but not identical to the Lifebook S6410/E8410 (which are ICH8M-based and use an ALC262). It is named lifebook as fujitsu is in use for Amilo machines. This builds on the Quanta FL1 work and supports all analog inputs & outputs that I am aware of. Microphone autoswitch is implemented. The laptop mic port takes precedence over the dock mic port if both happen to have a jack plugged in. This made sense to me as a design decision (imagine a presentation environment with the dock fully wired in and the presenter quickly wanting to override the mic with a headset). There is mention of a digital audio path on the codec graph, so perhaps the headphone socket is dual-function analog/digital. I will follow up with another patch if I can acquire equipment to test this. Signed-off-by: Tony Vroon <tony@linx.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: hda - Make codec-probing more robustTakashi Iwai2008-11-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When an error occurs during the codec probing, typically accessing to an non-existing codec slot, the controller chip gets often screwed up and can no longer communicate with the codecs. This patch adds a preparation phase just to probe codec addresses before actually creating codec instances. If any error occurs during this probing phase, the driver resets the controller to recover. This will (hopefully) fix the famous "single_cmd" errors. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | ALSA: hda - simplify hda_bus ops callbacksTakashi Iwai2008-11-06
| | | | | | | | | | | | | | | | The hda_bus ops callback take struct hda_bus pointer. Also, the command callback takes the composed command word, instead of each small bits in arguments. Signed-off-by: Takashi Iwai <tiwai@suse.de>