HD-audio updates for 3.5
cover HD-audio updates for 3.5
Hi,
this is a series of HD-audio patches for 3.5 kernel from topic/hda branch of sound git tree.
One behavior change is about the suspend/resume. As seen in another thread, now the driver tries to resume immediately instead of delaying the initialization. This is because we found out that some hardware (more exactly BIOS) don't initialize the chips correctly, thus the driver _must_ initialize them properly even for the further sleep / shutdown.
In the code organization side, I started moving some common codes into hda_auto_parser.[ch]. This will gather the codes commonly used for the BIOS auto-parser, and leave hda_codec.c a bit more cleaner.
In addition to these commits, there are pending commits for VGA- switcheroo support in topic/hda-switcheroo branch. The changes in VGA side have been already merged in Dave's upstream tree, and the rest for HD-audio will be merged soon (once after the conflict in linux-next is resolved...)
thanks,
Takashi
PATCH 1/15 ALSA: hda/realtek - Call a common helper for alc_spec initialization
Just a clean up by calling the same helper function.
--- sound/pci/hda/patch_realtek.c | 136 ++++++++++++++++++----------------------- 1 file changed, 61 insertions(+), 75 deletions(-)
sound/pci/hda/patch_realtek.c +61 -75
@@ -4405,6 +4405,25 @@ static int alc_parse_auto_config(struct hda_codec *codec,return 1 ; } +/* common preparation job for alc_spec */ +static int alc_alloc_spec (struct hda_codec *codec,hda_nid_t mixer_nid) +{ +struct alc_spec *spec =kzalloc (sizeof (*spec),GFP_KERNEL ); +int err; + +if (!spec) +return -ENOMEM ; + codec->spec = spec; + spec->mixer_nid = mixer_nid; + + err =alc_codec_rename_from_preset (codec); +if (err <0 ) { +kfree (spec); +return err; + } +return 0 ; +} +static int alc880_parse_auto_config (struct hda_codec *codec) {static const hda_nid_t alc880_ignore[] = {0x1d ,0 };
@@ -4786,13 +4805,11 @@ static int patch_alc880(struct hda_codec *codec)struct alc_spec *spec;int err; - spec =kzalloc (sizeof (*spec),GFP_KERNEL ); -if (spec ==NULL ) -return -ENOMEM ; - - codec->spec = spec; + err =alc_alloc_spec (codec,0x0b ); +if (err <0 ) +return err; - spec->mixer_nid =0x0b ; + spec = codec->spec; spec->need_dac_fix =1 ; alc_pick_fixup(codec, alc880_fixup_models, alc880_fixup_tbl,
@@ -4979,13 +4996,11 @@ static int patch_alc260(struct hda_codec *codec)struct alc_spec *spec;int err; - spec =kzalloc (sizeof (*spec),GFP_KERNEL ); -if (spec ==NULL ) -return -ENOMEM ; - - codec->spec = spec; + err =alc_alloc_spec (codec,0x07 ); +if (err <0 ) +return err; - spec->mixer_nid =0x07 ; + spec = codec->spec;alc_pick_fixup (codec,NULL , alc260_fixup_tbl, alc260_fixups);alc_apply_fixup (codec,ALC_FIXUP_ACT_PRE_PROBE );
@@ -5452,13 +5467,11 @@ static int patch_alc882(struct hda_codec *codec)struct alc_spec *spec;int err; - spec =kzalloc (sizeof (*spec),GFP_KERNEL ); -if (spec ==NULL ) -return -ENOMEM ; - - codec->spec = spec; + err =alc_alloc_spec (codec,0x0b ); +if (err <0 ) +return err; - spec->mixer_nid =0x0b ; + spec = codec->spec;switch (codec->vendor_id) {case 0x10ec0882 :
@@ -5470,10 +5483,6 @@ static int patch_alc882(struct hda_codec *codec)break ; } - err =alc_codec_rename_from_preset (codec); -if (err <0 ) - goto error; -alc_pick_fixup (codec, alc882_fixup_models, alc882_fixup_tbl, alc882_fixups);alc_apply_fixup (codec,ALC_FIXUP_ACT_PRE_PROBE );
@@ -5597,13 +5606,11 @@ static int patch_alc262(struct hda_codec *codec)struct alc_spec *spec;int err; - spec =kzalloc (sizeof (*spec),GFP_KERNEL ); -if (spec ==NULL ) -return -ENOMEM ; - - codec->spec = spec; + err =alc_alloc_spec (codec,0x0b ); +if (err <0 ) +return err; - spec->mixer_nid =0x0b ; + spec = codec->spec;#if 0 /* pshou 07/11/05 set a zero PCM sample to DAC when FIFO is
@@ -5699,13 +5706,12 @@ static int patch_alc268(struct hda_codec *codec)struct alc_spec *spec;int i, has_beep, err; - spec =kzalloc (sizeof (*spec),GFP_KERNEL ); -if (spec ==NULL ) -return -ENOMEM ; - - codec->spec = spec; -/* ALC268 has no aa-loopback mixer */ + err =alc_alloc_spec (codec,0 ); +if (err <0 ) +return err; + + spec = codec->spec;/* automatic parse from the BIOS config */ err =alc268_parse_auto_config (codec);
@@ -6216,19 +6222,13 @@ static void alc269_fill_coef(struct hda_codec *codec)static int patch_alc269 (struct hda_codec *codec) {struct alc_spec *spec; -int err =0 ; - - spec =kzalloc (sizeof (*spec),GFP_KERNEL ); -if (spec ==NULL ) -return -ENOMEM ; - - codec->spec = spec; - - spec->mixer_nid =0x0b ; +int err; - err =alc_codec_rename_from_preset (codec); + err =alc_alloc_spec (codec,0x0b );if (err <0 ) - goto error; +return err; + + spec = codec->spec;if (codec->vendor_id ==0x10ec0269 ) { spec->codec_variant =ALC269_TYPE_ALC269VA ;
@@ -6374,13 +6374,11 @@ static int patch_alc861(struct hda_codec *codec)struct alc_spec *spec;int err; - spec =kzalloc (sizeof (*spec),GFP_KERNEL ); -if (spec ==NULL ) -return -ENOMEM ; - - codec->spec = spec; + err =alc_alloc_spec (codec,0x15 ); +if (err <0 ) +return err; - spec->mixer_nid =0x15 ; + spec = codec->spec;alc_pick_fixup (codec,NULL , alc861_fixup_tbl, alc861_fixups);alc_apply_fixup (codec,ALC_FIXUP_ACT_PRE_PROBE );
@@ -6477,13 +6475,11 @@ static int patch_alc861vd(struct hda_codec *codec)struct alc_spec *spec;int err; - spec =kzalloc (sizeof (*spec),GFP_KERNEL ); -if (spec ==NULL ) -return -ENOMEM ; - - codec->spec = spec; + err =alc_alloc_spec (codec,0x0b ); +if (err <0 ) +return err; - spec->mixer_nid =0x0b ; + spec = codec->spec;alc_pick_fixup (codec,NULL , alc861vd_fixup_tbl, alc861vd_fixups);alc_apply_fixup (codec,ALC_FIXUP_ACT_PRE_PROBE );
@@ -6822,25 +6818,19 @@ static const struct alc_model_fixup alc662_fixup_models[] = {static int patch_alc662 (struct hda_codec *codec) {struct alc_spec *spec; -int err =0 ; - - spec =kzalloc (sizeof (*spec),GFP_KERNEL ); -if (!spec) -return -ENOMEM ; +int err; - codec->spec = spec; + err =alc_alloc_spec (codec,0x0b ); +if (err <0 ) +return err; - spec->mixer_nid =0x0b ; + spec = codec->spec;/* handle multiple HPs as is */ spec->parse_flags =HDA_PINCFG_NO_HP_FIXUP ;alc_fix_pll_init (codec,0x20 ,0x04 ,15 ); - err =alc_codec_rename_from_preset (codec); -if (err <0 ) - goto error; -if ((alc_get_coef0 (codec) & (1 <<14 )) && codec->bus->pci->subsystem_vendor ==0x1025 && spec->cdefine.platform_type ==1 ) {
@@ -6903,16 +6893,12 @@ static int alc680_parse_auto_config(struct hda_codec *codec)*/ static int patch_alc680 (struct hda_codec *codec) { -struct alc_spec *spec;int err; - spec =kzalloc (sizeof (*spec),GFP_KERNEL ); -if (spec ==NULL ) -return -ENOMEM ; - - codec->spec = spec; -/* ALC680 has no aa-loopback mixer */ + err =alc_alloc_spec (codec,0 ); +if (err <0 ) +return err;/* automatic parse from the BIOS config */ err =alc680_parse_auto_config (codec);
Signature · 1 line
1.7.9.2
PATCH 2/15 ALSA: hda - Fix possible access to uninitialized work struct
In reply to Takashi IwaiThe work struct must be initialized before the possible call in the destructor.
--- sound/pci/hda/hda_codec.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
sound/pci/hda/hda_codec.c +8 -7
@@ -1264,13 +1264,6 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus,snd_array_init (&codec->cvt_setups,sizeof (struct hda_cvt_setup ),8 );snd_array_init (&codec->conn_lists,sizeof (hda_nid_t),64 );snd_array_init (&codec->spdif_out,sizeof (struct hda_spdif_out ),16 ); -if (codec->bus->modelname) { - codec->modelname =kstrdup (codec->bus->modelname,GFP_KERNEL ); -if (!codec->modelname) { -snd_hda_codec_free (codec); -return -ENODEV ; - } - }#ifdef CONFIG_SND_HDA_POWER_SAVE INIT_DELAYED_WORK (&codec->power_work, hda_power_work);
@@ -1281,6 +1274,14 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus,hda_keep_power_on (codec);#endif +if (codec->bus->modelname) { + codec->modelname =kstrdup (codec->bus->modelname,GFP_KERNEL ); +if (!codec->modelname) { +snd_hda_codec_free (codec); +return -ENODEV ; + } + } +list_add_tail (&codec->list, &bus->codec_list); bus->caddr_tbl[codec_addr] = codec;
Signature · 1 line
1.7.9.2
PATCH 3/15 ALSA: hda - Always resume the codec immediately
In reply to Takashi IwaiThis is a fix for the problem in commit 785f857d1c, the pop noise issue on some machines with ALC269. The problem was the uninitialized state after the resume due to the delayed resume of the codec chips. In that commit, we tried to fix by forcibly putting the codec to D3 at suspend. But, this still also leaves the uninitialized state after resume, and it _might_ be still problematic with some BIOS. Since the commit turned out to regress another issues, we reverted it in the end.
Now, in this fix, try to fix by turning on the codec immediately at the resume path. We need to take care of the power-saving in this case. When the device is woken up at the power-saved state, it should go power-saving again after the resume.
--- sound/pci/hda/hda_codec.c | 9 +++++++-- sound/pci/hda/hda_codec.h | 2 -- sound/pci/hda/hda_intel.c | 14 +------------- 3 files changed, 8 insertions(+), 17 deletions(-)
sound/pci/hda/hda_codec.c +7 -2
@@ -3500,6 +3500,10 @@ static void hda_call_codec_suspend(struct hda_codec *codec)*/ static void hda_call_codec_resume (struct hda_codec *codec) { +/* set as if powered on for avoiding re-entering the resume +* in the resume / power-save sequence +*/ +hda_keep_power_on (codec);hda_set_power_state (codec, codec->afg ? codec->afg : codec->mfg,AC_PWRST_D0 );
@@ -3515,6 +3519,7 @@ static void hda_call_codec_resume(struct hda_codec *codec)snd_hda_codec_resume_amp (codec); snd_hda_codec_resume_cache(codec); } +snd_hda_power_down (codec);/* flag down before returning */ }#endif /* CONFIG_PM */
@@ -4332,6 +4337,7 @@ void snd_hda_power_up(struct hda_codec *codec)snd_hda_update_power_acct (codec); codec->power_on =1 ; codec->power_jiffies = jiffies; + codec->power_transition =1 ;/* avoid reentrance */ if (bus->ops.pm_notify) bus->ops.pm_notify (bus);hda_call_codec_resume (codec);
@@ -5521,8 +5527,7 @@ int snd_hda_resume(struct hda_bus *bus)list_for_each_entry (codec, &bus->codec_list, list) {if (codec->patch_ops.pre_resume) codec->patch_ops.pre_resume (codec); -if (snd_hda_codec_needs_resume (codec)) -hda_call_codec_resume (codec); +hda_call_codec_resume (codec); }return 0 ; }
sound/pci/hda/hda_codec.h +0 -2
@@ -1051,12 +1051,10 @@ const char *snd_hda_get_jack_location(u32 cfg);#ifdef CONFIG_SND_HDA_POWER_SAVE void snd_hda_power_up (struct hda_codec *codec);void snd_hda_power_down (struct hda_codec *codec); -#define snd_hda_codec_needs_resume (codec) codec->power_countvoid snd_hda_update_power_acct (struct hda_codec *codec);#else static inline void snd_hda_power_up (struct hda_codec *codec) {}static inline void snd_hda_power_down (struct hda_codec *codec) {} -#define snd_hda_codec_needs_resume (codec) 1#endif #ifdef CONFIG_SND_HDA_PATCH_LOADER
sound/pci/hda/hda_intel.c +1 -13
@@ -2351,17 +2351,6 @@ static void azx_power_notify(struct hda_bus *bus)* power management */ -static int snd_hda_codecs_inuse (struct hda_bus *bus) -{ -struct hda_codec *codec; - -list_for_each_entry (codec, &bus->codec_list, list) { -if (snd_hda_codec_needs_resume (codec)) -return 1 ; - } -return 0 ; -} -static int azx_suspend (struct pci_dev *pci,pm_message_t state) {struct snd_card *card =pci_get_drvdata (pci);
@@ -2408,8 +2397,7 @@ static int azx_resume(struct pci_dev *pci)return -EIO ;azx_init_pci (chip); -if (snd_hda_codecs_inuse (chip->bus)) -azx_init_chip (chip,1 ); +azx_init_chip (chip,1 );snd_hda_resume (chip->bus);snd_power_change_state (card,SNDRV_CTL_POWER_D0 );
Signature · 1 line
1.7.9.2
PATCH 4/15 ALSA: hda - Clear the power-saving states properly at reset
In reply to Takashi IwaiSome power-saving states have been left unchanged in snd_hda_codec_reset(), and this is a potential danger because the function may be called in various situations including the continuous operation after that call.
--- sound/pci/hda/hda_codec.c | 3 +++ 1 file changed, 3 insertions(+)
sound/pci/hda/hda_codec.c +3 -0
@@ -2265,6 +2265,9 @@ int snd_hda_codec_reset(struct hda_codec *codec)#ifdef CONFIG_SND_HDA_POWER_SAVE cancel_delayed_work (&codec->power_work); + codec->power_on =0 ; + codec->power_transition =0 ; + codec->power_jiffies = jiffies;flush_workqueue (codec->bus->workq);#endif snd_hda_ctls_clear (codec);
Signature · 1 line
1.7.9.2
PATCH 5/15 ALSA: hda - Protect the power-saving count with spinlock
In reply to Takashi IwaiTo avoid some races. Still not perfect, but now a bit safer.
--- sound/pci/hda/hda_codec.c | 23 +++++++++++++++++++++-- sound/pci/hda/hda_codec.h | 1 + 2 files changed, 22 insertions(+), 2 deletions(-)
sound/pci/hda/hda_codec.c +21 -2
@@ -1266,6 +1266,7 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus,snd_array_init (&codec->spdif_out,sizeof (struct hda_spdif_out ),16 );#ifdef CONFIG_SND_HDA_POWER_SAVE +spin_lock_init (&codec->power_lock);INIT_DELAYED_WORK (&codec->power_work, hda_power_work);/* snd_hda_codec_new() marks the codec as power-up, and leave it as is. * the caller has to power down appropriatley after initialization
@@ -4292,12 +4293,16 @@ static void hda_power_work(struct work_struct *work) container_of(work, struct hda_codec, power_work.work);struct hda_bus *bus = codec->bus; +spin_lock (&codec->power_lock);if (!codec->power_on || codec->power_count) { codec->power_transition =0 ; +spin_unlock (&codec->power_lock);return ; }trace_hda_power_down (codec); +spin_unlock (&codec->power_lock); +hda_call_codec_suspend (codec);if (bus->ops.pm_notify) bus->ops.pm_notify (bus);
@@ -4305,9 +4310,11 @@ static void hda_power_work(struct work_struct *work)static void hda_keep_power_on (struct hda_codec *codec) { +spin_lock (&codec->power_lock); codec->power_count++; codec->power_on =1 ; codec->power_jiffies = jiffies; +spin_unlock (&codec->power_lock); }/* update the power on/off account with the current jiffies */
@@ -4332,20 +4339,28 @@ void snd_hda_power_up(struct hda_codec *codec) {struct hda_bus *bus = codec->bus; +spin_lock (&codec->power_lock); codec->power_count++; -if (codec->power_on || codec->power_transition) +if (codec->power_on || codec->power_transition) { +spin_unlock (&codec->power_lock);return ; + }trace_hda_power_up (codec);snd_hda_update_power_acct (codec); codec->power_on =1 ; codec->power_jiffies = jiffies; codec->power_transition =1 ;/* avoid reentrance */ +spin_unlock (&codec->power_lock); +if (bus->ops.pm_notify) bus->ops.pm_notify (bus);hda_call_codec_resume (codec); + +spin_lock (&codec->power_lock);cancel_delayed_work (&codec->power_work); codec->power_transition =0 ; +spin_unlock (&codec->power_lock); }EXPORT_SYMBOL_HDA (snd_hda_power_up);
@@ -4361,14 +4376,18 @@ EXPORT_SYMBOL_HDA(snd_hda_power_up);*/ void snd_hda_power_down (struct hda_codec *codec) { +spin_lock (&codec->power_lock); --codec->power_count; -if (!codec->power_on || codec->power_count || codec->power_transition) +if (!codec->power_on || codec->power_count || codec->power_transition) { +spin_unlock (&codec->power_lock);return ; + }if (power_save (codec)) { codec->power_transition =1 ;/* avoid reentrance */ queue_delayed_work (codec->bus->workq, &codec->power_work,msecs_to_jiffies (power_save (codec) *1000 )); } +spin_unlock (&codec->power_lock); }EXPORT_SYMBOL_HDA (snd_hda_power_down);
sound/pci/hda/hda_codec.h +1 -0
@@ -867,6 +867,7 @@ struct hda_codec {unsigned long power_on_acct;unsigned long power_off_acct;unsigned long power_jiffies; +spinlock_t power_lock;#endif /* codec-specific additional proc output */
Signature · 1 line
1.7.9.2
PATCH 6/15 ALSA: hda - Move up the fixup helper functions to the library module
In reply to Takashi IwaiMove the fixup helper functions in patch_realtek.c to hda_auto_parser.c so that they can be used in other codec drivers like patch_conexant.c.
--- sound/pci/hda/Makefile | 2 +- sound/pci/hda/hda_auto_parser.c | 163 ++++++++++++++++++++++++++ sound/pci/hda/hda_auto_parser.h | 80 +++++++++++++ sound/pci/hda/patch_conexant.c | 62 ++++------ sound/pci/hda/patch_realtek.c | 244 +++++++-------------------------------- 5 files changed, 309 insertions(+), 242 deletions(-) create mode 100644 sound/pci/hda/hda_auto_parser.c create mode 100644 sound/pci/hda/hda_auto_parser.h
sound/pci/hda/Makefile +1 -1
@@ -1,6 +1,6 @@ snd-hda-intel-objs := hda_intel.o -snd-hda-codec-y := hda_codec.o hda_jack.o +snd-hda-codec-y := hda_codec.o hda_jack.o hda_auto_parser.o snd-hda-codec-$(CONFIG_SND_HDA_GENERIC) += hda_generic.o snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o
sound/pci/hda/hda_auto_parser.c new file +163 -0
163 lines not on this page · raw message
sound/pci/hda/hda_auto_parser.h new file +80 -0
80 lines not on this page · raw message
sound/pci/hda/patch_conexant.c +25 -37
114 lines not on this page · raw message
sound/pci/hda/patch_realtek.c +40 -204
341 lines not on this page · raw message
Signature · 1 line
1.7.9.2
PATCH 7/15 ALSA: hda - Move BIOS pin-parser code to hda_auto_parser.c
In reply to Takashi IwaiJust code shuffles.
--- sound/pci/hda/hda_auto_parser.c | 597 +++++++++++++++++++++++++++++++++++++++ sound/pci/hda/hda_auto_parser.h | 80 ++++++ sound/pci/hda/hda_codec.c | 596 -------------------------------------- sound/pci/hda/hda_jack.c | 1 + sound/pci/hda/hda_jack.h | 2 + sound/pci/hda/hda_local.h | 82 +----- sound/pci/hda/patch_analog.c | 1 + sound/pci/hda/patch_ca0110.c | 1 + sound/pci/hda/patch_ca0132.c | 1 + sound/pci/hda/patch_cirrus.c | 1 + sound/pci/hda/patch_cmedia.c | 1 + sound/pci/hda/patch_sigmatel.c | 1 + sound/pci/hda/patch_via.c | 1 + 13 files changed, 690 insertions(+), 675 deletions(-)
sound/pci/hda/hda_auto_parser.c +597 -0
@@ -13,10 +13,607 @@#include <linux/export.h> #include <sound/core.h> #include "hda_codec.h" +#include "hda_local.h" #include "hda_auto_parser.h" #define SFX "hda_codec: " +/* +* Helper for automatic pin configuration +*/ + +static int is_in_nid_list (hda_nid_t nid,const hda_nid_t *list) +{ +for (; *list; list++) +if (*list == nid) +return 1 ; +return 0 ; +} + + +/* +* Sort an associated group of pins according to their sequence numbers. +*/ +static void sort_pins_by_sequence (hda_nid_t *pins,short *sequences, +int num_pins) +{ +int i, j; +short seq; +hda_nid_t nid; + +for (i =0 ; i < num_pins; i++) { +for (j = i +1 ; j < num_pins; j++) { +if (sequences[i] > sequences[j]) { + seq = sequences[i]; + sequences[i] = sequences[j]; + sequences[j] = seq; + nid = pins[i]; + pins[i] = pins[j]; + pins[j] = nid; + } + } + } +} + + +/* add the found input-pin to the cfg->inputs[] table */ +static void add_auto_cfg_input_pin (struct auto_pin_cfg *cfg,hda_nid_t nid, +int type) +{ +if (cfg->num_inputs <AUTO_CFG_MAX_INS ) { + cfg->inputs[cfg->num_inputs].pin = nid; + cfg->inputs[cfg->num_inputs].type = type; + cfg->num_inputs++; + } +} + +/* sort inputs in the order of AUTO_PIN_* type */ +static void sort_autocfg_input_pins (struct auto_pin_cfg *cfg) +{ +int i, j; + +for (i =0 ; i < cfg->num_inputs; i++) { +for (j = i +1 ; j < cfg->num_inputs; j++) { +if (cfg->inputs[i].type > cfg->inputs[j].type) { +struct auto_pin_cfg_item tmp; + tmp = cfg->inputs[i]; + cfg->inputs[i] = cfg->inputs[j]; + cfg->inputs[j] = tmp; + } + } + } +} + +/* Reorder the surround channels +* ALSA sequence is front/surr/clfe/side +* HDA sequence is: +* 4-ch: front/surr => OK as it is +* 6-ch: front/clfe/surr +* 8-ch: front/clfe/rear/side|fc +*/ +static void reorder_outputs (unsigned int nums,hda_nid_t *pins) +{ +hda_nid_t nid; + +switch (nums) { +case 3 : +case 4 : + nid = pins[1 ]; + pins[1 ] = pins[2 ]; + pins[2 ] = nid; +break ; + } +} + +/* +* Parse all pin widgets and store the useful pin nids to cfg +* +* The number of line-outs or any primary output is stored in line_outs, +* and the corresponding output pins are assigned to line_out_pins[], +* in the order of front, rear, CLFE, side, ... +* +* If more extra outputs (speaker and headphone) are found, the pins are +* assisnged to hp_pins[] and speaker_pins[], respectively. If no line-out jack +* is detected, one of speaker of HP pins is assigned as the primary +* output, i.e. to line_out_pins[0]. So, line_outs is always positive +* if any analog output exists. +* +* The analog input pins are assigned to inputs array. +* The digital input/output pins are assigned to dig_in_pin and dig_out_pin, +* respectively. +*/ +int snd_hda_parse_pin_defcfg (struct hda_codec *codec, +struct auto_pin_cfg *cfg, +const hda_nid_t *ignore_nids, +unsigned int cond_flags) +{ +hda_nid_t nid, end_nid; +short seq, assoc_line_out; +short sequences_line_out[ARRAY_SIZE (cfg->line_out_pins)]; +short sequences_speaker[ARRAY_SIZE (cfg->speaker_pins)]; +short sequences_hp[ARRAY_SIZE (cfg->hp_pins)]; +int i; + +memset (cfg,0 ,sizeof (*cfg)); + +memset (sequences_line_out,0 ,sizeof (sequences_line_out)); +memset (sequences_speaker,0 ,sizeof (sequences_speaker)); +memset (sequences_hp,0 ,sizeof (sequences_hp)); + assoc_line_out =0 ; + + codec->ignore_misc_bit = true; + end_nid = codec->start_nid + codec->num_nodes; +for (nid = codec->start_nid; nid < end_nid; nid++) { +unsigned int wid_caps =get_wcaps (codec, nid); +unsigned int wid_type =get_wcaps_type (wid_caps); +unsigned int def_conf; +short assoc, loc, conn, dev; + +/* read all default configuration for pin complex */ +if (wid_type !=AC_WID_PIN ) +continue ; +/* ignore the given nids (e.g. pc-beep returns error) */ +if (ignore_nids &&is_in_nid_list (nid, ignore_nids)) +continue ; + + def_conf =snd_hda_codec_get_pincfg (codec, nid); +if (!(get_defcfg_misc (snd_hda_codec_get_pincfg (codec, nid)) & +AC_DEFCFG_MISC_NO_PRESENCE )) + codec->ignore_misc_bit = false; + conn =get_defcfg_connect (def_conf); +if (conn ==AC_JACK_PORT_NONE ) +continue ; + loc =get_defcfg_location (def_conf); + dev =get_defcfg_device (def_conf); + +/* workaround for buggy BIOS setups */ +if (dev ==AC_JACK_LINE_OUT ) { +if (conn ==AC_JACK_PORT_FIXED ) + dev =AC_JACK_SPEAKER ; + } + +switch (dev) { +case AC_JACK_LINE_OUT : + seq =get_defcfg_sequence (def_conf); + assoc =get_defcfg_association (def_conf); + +if (!(wid_caps &AC_WCAP_STEREO )) +if (!cfg->mono_out_pin) + cfg->mono_out_pin = nid; +if (!assoc) +continue ; +if (!assoc_line_out) + assoc_line_out = assoc; +else if (assoc_line_out != assoc) +continue ; +if (cfg->line_outs >=ARRAY_SIZE (cfg->line_out_pins)) +continue ; + cfg->line_out_pins[cfg->line_outs] = nid; + sequences_line_out[cfg->line_outs] = seq; + cfg->line_outs++; +break ; +case AC_JACK_SPEAKER : + seq =get_defcfg_sequence (def_conf); + assoc =get_defcfg_association (def_conf); +if (cfg->speaker_outs >=ARRAY_SIZE (cfg->speaker_pins)) +continue ; + cfg->speaker_pins[cfg->speaker_outs] = nid; + sequences_speaker[cfg->speaker_outs] = (assoc <<4 ) | seq; + cfg->speaker_outs++; +break ; +case AC_JACK_HP_OUT : + seq =get_defcfg_sequence (def_conf); + assoc =get_defcfg_association (def_conf); +if (cfg->hp_outs >=ARRAY_SIZE (cfg->hp_pins)) +continue ; + cfg->hp_pins[cfg->hp_outs] = nid; + sequences_hp[cfg->hp_outs] = (assoc <<4 ) | seq; + cfg->hp_outs++; +break ; +case AC_JACK_MIC_IN : +add_auto_cfg_input_pin (cfg, nid,AUTO_PIN_MIC ); +break ; +case AC_JACK_LINE_IN : +add_auto_cfg_input_pin (cfg, nid,AUTO_PIN_LINE_IN ); +break ; +case AC_JACK_CD : +add_auto_cfg_input_pin (cfg, nid,AUTO_PIN_CD ); +break ; +case AC_JACK_AUX : +add_auto_cfg_input_pin (cfg, nid,AUTO_PIN_AUX ); +break ; +case AC_JACK_SPDIF_OUT : +case AC_JACK_DIG_OTHER_OUT : +if (cfg->dig_outs >=ARRAY_SIZE (cfg->dig_out_pins)) +continue ; + cfg->dig_out_pins[cfg->dig_outs] = nid; + cfg->dig_out_type[cfg->dig_outs] = + (loc ==AC_JACK_LOC_HDMI ) ? +HDA_PCM_TYPE_HDMI :HDA_PCM_TYPE_SPDIF ; + cfg->dig_outs++; +break ; +case AC_JACK_SPDIF_IN : +case AC_JACK_DIG_OTHER_IN : + cfg->dig_in_pin = nid; +if (loc ==AC_JACK_LOC_HDMI ) + cfg->dig_in_type =HDA_PCM_TYPE_HDMI ; +else + cfg->dig_in_type =HDA_PCM_TYPE_SPDIF ; +break ; + } + } + +/* FIX-UP: +* If no line-out is defined but multiple HPs are found, +* some of them might be the real line-outs. +*/ +if (!cfg->line_outs && cfg->hp_outs >1 && + !(cond_flags &HDA_PINCFG_NO_HP_FIXUP )) { +int i =0 ; +while (i < cfg->hp_outs) { +/* The real HPs should have the sequence 0x0f */ +if ((sequences_hp[i] &0x0f ) ==0x0f ) { + i++; +continue ; + } +/* Move it to the line-out table */ + cfg->line_out_pins[cfg->line_outs] = cfg->hp_pins[i]; + sequences_line_out[cfg->line_outs] = sequences_hp[i]; + cfg->line_outs++; + cfg->hp_outs--; +memmove (cfg->hp_pins + i, cfg->hp_pins + i +1 , +sizeof (cfg->hp_pins[0 ]) * (cfg->hp_outs - i)); +memmove (sequences_hp + i, sequences_hp + i +1 , +sizeof (sequences_hp[0 ]) * (cfg->hp_outs - i)); + } +memset (cfg->hp_pins + cfg->hp_outs,0 , +sizeof (hda_nid_t) * (AUTO_CFG_MAX_OUTS - cfg->hp_outs)); +if (!cfg->hp_outs) + cfg->line_out_type =AUTO_PIN_HP_OUT ; + + } + +/* sort by sequence */ +sort_pins_by_sequence (cfg->line_out_pins, sequences_line_out, + cfg->line_outs); +sort_pins_by_sequence (cfg->speaker_pins, sequences_speaker, + cfg->speaker_outs); +sort_pins_by_sequence (cfg->hp_pins, sequences_hp, + cfg->hp_outs); + +/* +* FIX-UP: if no line-outs are detected, try to use speaker or HP pin +* as a primary output +*/ +if (!cfg->line_outs && + !(cond_flags &HDA_PINCFG_NO_LO_FIXUP )) { +if (cfg->speaker_outs) { + cfg->line_outs = cfg->speaker_outs; +memcpy (cfg->line_out_pins, cfg->speaker_pins, +sizeof (cfg->speaker_pins)); + cfg->speaker_outs =0 ; +memset (cfg->speaker_pins,0 ,sizeof (cfg->speaker_pins)); + cfg->line_out_type =AUTO_PIN_SPEAKER_OUT ; + }else if (cfg->hp_outs) { + cfg->line_outs = cfg->hp_outs; +memcpy (cfg->line_out_pins, cfg->hp_pins, +sizeof (cfg->hp_pins)); + cfg->hp_outs =0 ; +memset (cfg->hp_pins,0 ,sizeof (cfg->hp_pins)); + cfg->line_out_type =AUTO_PIN_HP_OUT ; + } + } + +reorder_outputs (cfg->line_outs, cfg->line_out_pins); +reorder_outputs (cfg->hp_outs, cfg->hp_pins); +reorder_outputs (cfg->speaker_outs, cfg->speaker_pins); + +sort_autocfg_input_pins (cfg); + +/* +* debug prints of the parsed results +*/ +snd_printd ("autoconfig: line_outs=%d (0x%x/0x%x/0x%x/0x%x/0x%x) type:%s\n" , + cfg->line_outs, cfg->line_out_pins[0 ], cfg->line_out_pins[1 ], + cfg->line_out_pins[2 ], cfg->line_out_pins[3 ], + cfg->line_out_pins[4 ], + cfg->line_out_type ==AUTO_PIN_HP_OUT ?"hp" : + (cfg->line_out_type ==AUTO_PIN_SPEAKER_OUT ? +"speaker" :"line" )); +snd_printd (" speaker_outs=%d (0x%x/0x%x/0x%x/0x%x/0x%x)\n" , + cfg->speaker_outs, cfg->speaker_pins[0 ], + cfg->speaker_pins[1 ], cfg->speaker_pins[2 ], + cfg->speaker_pins[3 ], cfg->speaker_pins[4 ]); +snd_printd (" hp_outs=%d (0x%x/0x%x/0x%x/0x%x/0x%x)\n" , + cfg->hp_outs, cfg->hp_pins[0 ], + cfg->hp_pins[1 ], cfg->hp_pins[2 ], + cfg->hp_pins[3 ], cfg->hp_pins[4 ]); +snd_printd (" mono: mono_out=0x%x\n" , cfg->mono_out_pin); +if (cfg->dig_outs) +snd_printd (" dig-out=0x%x/0x%x\n" , + cfg->dig_out_pins[0 ], cfg->dig_out_pins[1 ]); +snd_printd (" inputs:" ); +for (i =0 ; i < cfg->num_inputs; i++) { +snd_printd (" %s=0x%x" , +hda_get_autocfg_input_label (codec, cfg, i), + cfg->inputs[i].pin); + } +snd_printd ("\n" ); +if (cfg->dig_in_pin) +snd_printd (" dig-in=0x%x\n" , cfg->dig_in_pin); + +return 0 ; +} +EXPORT_SYMBOL_HDA (snd_hda_parse_pin_defcfg); + +int snd_hda_get_input_pin_attr (unsigned int def_conf) +{ +unsigned int loc =get_defcfg_location (def_conf); +unsigned int conn =get_defcfg_connect (def_conf); +if (conn ==AC_JACK_PORT_NONE ) +return INPUT_PIN_ATTR_UNUSED ; +/* Windows may claim the internal mic to be BOTH, too */ +if (conn ==AC_JACK_PORT_FIXED || conn ==AC_JACK_PORT_BOTH ) +return INPUT_PIN_ATTR_INT ; +if ((loc &0x30 ) ==AC_JACK_LOC_INTERNAL ) +return INPUT_PIN_ATTR_INT ; +if ((loc &0x30 ) ==AC_JACK_LOC_SEPARATE ) +return INPUT_PIN_ATTR_DOCK ; +if (loc ==AC_JACK_LOC_REAR ) +return INPUT_PIN_ATTR_REAR ; +if (loc ==AC_JACK_LOC_FRONT ) +return INPUT_PIN_ATTR_FRONT ; +return INPUT_PIN_ATTR_NORMAL ; +} +EXPORT_SYMBOL_HDA (snd_hda_get_input_pin_attr); + +/** +* hda_get_input_pin_label - Give a label for the given input pin +* +* When check_location is true, the function checks the pin location +* for mic and line-in pins, and set an appropriate prefix like "Front", +* "Rear", "Internal". +*/ + +static const char *hda_get_input_pin_label (struct hda_codec *codec, +hda_nid_t pin,bool check_location) +{ +unsigned int def_conf; +static const char *const mic_names[] = { +"Internal Mic" ,"Dock Mic" ,"Mic" ,"Front Mic" ,"Rear Mic" , + }; +int attr; + + def_conf =snd_hda_codec_get_pincfg (codec, pin); + +switch (get_defcfg_device (def_conf)) { +case AC_JACK_MIC_IN : +if (!check_location) +return "Mic" ; + attr =snd_hda_get_input_pin_attr (def_conf); +if (!attr) +return "None" ; +return mic_names[attr -1 ]; +case AC_JACK_LINE_IN : +if (!check_location) +return "Line" ; + attr =snd_hda_get_input_pin_attr (def_conf); +if (!attr) +return "None" ; +if (attr ==INPUT_PIN_ATTR_DOCK ) +return "Dock Line" ; +return "Line" ; +case AC_JACK_AUX : +return "Aux" ; +case AC_JACK_CD : +return "CD" ; +case AC_JACK_SPDIF_IN : +return "SPDIF In" ; +case AC_JACK_DIG_OTHER_IN : +return "Digital In" ; +default : +return "Misc" ; + } +} + +/* Check whether the location prefix needs to be added to the label. +* If all mic-jacks are in the same location (e.g. rear panel), we don't +* have to put "Front" prefix to each label. In such a case, returns false. +*/ +static int check_mic_location_need (struct hda_codec *codec, +const struct auto_pin_cfg *cfg, +int input) +{ +unsigned int defc; +int i, attr, attr2; + + defc =snd_hda_codec_get_pincfg (codec, cfg->inputs[input].pin); + attr =snd_hda_get_input_pin_attr (defc); +/* for internal or docking mics, we need locations */ +if (attr <=INPUT_PIN_ATTR_NORMAL ) +return 1 ; + + attr =0 ; +for (i =0 ; i < cfg->num_inputs; i++) { + defc =snd_hda_codec_get_pincfg (codec, cfg->inputs[i].pin); + attr2 =snd_hda_get_input_pin_attr (defc); +if (attr2 >=INPUT_PIN_ATTR_NORMAL ) { +if (attr && attr != attr2) +return 1 ;/* different locations found */ + attr = attr2; + } + } +return 0 ; +} + +/** +* hda_get_autocfg_input_label - Get a label for the given input +* +* Get a label for the given input pin defined by the autocfg item. +* Unlike hda_get_input_pin_label(), this function checks all inputs +* defined in autocfg and avoids the redundant mic/line prefix as much as +* possible. +*/ +const char *hda_get_autocfg_input_label (struct hda_codec *codec, +const struct auto_pin_cfg *cfg, +int input) +{ +int type = cfg->inputs[input].type; +int has_multiple_pins =0 ; + +if ((input >0 && cfg->inputs[input -1 ].type == type) || + (input < cfg->num_inputs -1 && cfg->inputs[input +1 ].type == type)) + has_multiple_pins =1 ; +if (has_multiple_pins && type ==AUTO_PIN_MIC ) + has_multiple_pins &=check_mic_location_need (codec, cfg, input); +return hda_get_input_pin_label (codec, cfg->inputs[input].pin, + has_multiple_pins); +} +EXPORT_SYMBOL_HDA (hda_get_autocfg_input_label); + +/* return the position of NID in the list, or -1 if not found */ +static int find_idx_in_nid_list (hda_nid_t nid,const hda_nid_t *list,int nums) +{ +int i; +for (i =0 ; i < nums; i++) +if (list[i] == nid) +return i; +return -1 ; +} + +/* get a unique suffix or an index number */ +static const char *check_output_sfx (hda_nid_t nid,const hda_nid_t *pins, +int num_pins,int *indexp) +{ +static const char *const channel_sfx[] = { +" Front" ," Surround" ," CLFE" ," Side" + }; +int i; + + i =find_idx_in_nid_list (nid, pins, num_pins); +if (i <0 ) +return NULL ; +if (num_pins ==1 ) +return "" ; +if (num_pins >ARRAY_SIZE (channel_sfx)) { +if (indexp) + *indexp = i; +return "" ; + } +return channel_sfx[i]; +} + +static int fill_audio_out_name (struct hda_codec *codec,hda_nid_t nid, +const struct auto_pin_cfg *cfg, +const char *name,char *label,int maxlen, +int *indexp) +{ +unsigned int def_conf =snd_hda_codec_get_pincfg (codec, nid); +int attr =snd_hda_get_input_pin_attr (def_conf); +const char *pfx ="" , *sfx ="" ; + +/* handle as a speaker if it's a fixed line-out */ +if (!strcmp (name,"Line Out" ) && attr ==INPUT_PIN_ATTR_INT ) + name ="Speaker" ; +/* check the location */ +switch (attr) { +case INPUT_PIN_ATTR_DOCK : + pfx ="Dock " ; +break ; +case INPUT_PIN_ATTR_FRONT : + pfx ="Front " ; +break ; + } +if (cfg) { +/* try to give a unique suffix if needed */ + sfx =check_output_sfx (nid, cfg->line_out_pins, cfg->line_outs, + indexp); +if (!sfx) + sfx =check_output_sfx (nid, cfg->speaker_pins, cfg->speaker_outs, + indexp); +if (!sfx) { +/* don't add channel suffix for Headphone controls */ +int idx =find_idx_in_nid_list (nid, cfg->hp_pins, + cfg->hp_outs); +if (idx >=0 ) + *indexp = idx; + sfx ="" ; + } + } +snprintf (label, maxlen,"%s%s%s" , pfx, name, sfx); +return 1 ; +} + +/** +* snd_hda_get_pin_label - Get a label for the given I/O pin +* +* Get a label for the given pin. This function works for both input and +* output pins. When @cfg is given as non-NULL, the function tries to get +* an optimized label using hda_get_autocfg_input_label(). +* +* This function tries to give a unique label string for the pin as much as +* possible. For example, when the multiple line-outs are present, it adds +* the channel suffix like "Front", "Surround", etc (only when @cfg is given). +* If no unique name with a suffix is available and @indexp is non-NULL, the +* index number is stored in the pointer. +*/ +int snd_hda_get_pin_label (struct hda_codec *codec,hda_nid_t nid, +const struct auto_pin_cfg *cfg, +char *label,int maxlen,int *indexp) +{ +unsigned int def_conf =snd_hda_codec_get_pincfg (codec, nid); +const char *name =NULL ; +int i; + +if (indexp) + *indexp =0 ; +if (get_defcfg_connect (def_conf) ==AC_JACK_PORT_NONE ) +return 0 ; + +switch (get_defcfg_device (def_conf)) { +case AC_JACK_LINE_OUT : +return fill_audio_out_name (codec, nid, cfg,"Line Out" , + label, maxlen, indexp); +case AC_JACK_SPEAKER : +return fill_audio_out_name (codec, nid, cfg,"Speaker" , + label, maxlen, indexp); +case AC_JACK_HP_OUT : +return fill_audio_out_name (codec, nid, cfg,"Headphone" , + label, maxlen, indexp); +case AC_JACK_SPDIF_OUT : +case AC_JACK_DIG_OTHER_OUT : +if (get_defcfg_location (def_conf) ==AC_JACK_LOC_HDMI ) + name ="HDMI" ; +else + name ="SPDIF" ; +if (cfg && indexp) { + i =find_idx_in_nid_list (nid, cfg->dig_out_pins, + cfg->dig_outs); +if (i >=0 ) + *indexp = i; + } +break ; +default : +if (cfg) { +for (i =0 ; i < cfg->num_inputs; i++) { +if (cfg->inputs[i].pin != nid) +continue ; + name =hda_get_autocfg_input_label (codec, cfg, i); +if (name) +break ; + } + } +if (!name) + name =hda_get_input_pin_label (codec, nid, true); +break ; + } +if (!name) +return 0 ; +strlcpy (label, name, maxlen); +return 1 ; +} +EXPORT_SYMBOL_HDA (snd_hda_get_pin_label); +int snd_hda_gen_add_verbs (struct hda_gen_spec *spec,const struct hda_verb *list) {
sound/pci/hda/hda_auto_parser.h +80 -0
86 lines not on this page · raw message
sound/pci/hda/hda_codec.c +0 -596
602 lines not on this page · raw message
sound/pci/hda/hda_jack.c +1 -0
@@ -17,6 +17,7 @@#include <sound/jack.h> #include "hda_codec.h" #include "hda_local.h" +#include "hda_auto_parser.h" #include "hda_jack.h" bool is_jack_detectable (struct hda_codec *codec,hda_nid_t nid)
sound/pci/hda/hda_jack.h +2 -0
@@ -12,6 +12,8 @@ #ifndef __SOUND_HDA_JACK_H #define __SOUND_HDA_JACK_H +struct auto_pin_cfg; + struct hda_jack_tbl { hda_nid_t nid; unsigned char action; /* event action (0 = none) */
sound/pci/hda/hda_local.h +3 -79
100 lines not on this page · raw message
sound/pci/hda/patch_analog.c +1 -0
@@ -28,6 +28,7 @@#include <sound/core.h> #include "hda_codec.h" #include "hda_local.h" +#include "hda_auto_parser.h" #include "hda_beep.h" #include "hda_jack.h"
sound/pci/hda/patch_ca0110.c +1 -0
@@ -26,6 +26,7 @@#include <sound/core.h> #include "hda_codec.h" #include "hda_local.h" +#include "hda_auto_parser.h" /* */
sound/pci/hda/patch_ca0132.c +1 -0
@@ -30,6 +30,7 @@#include <sound/core.h> #include "hda_codec.h" #include "hda_local.h" +#include "hda_auto_parser.h" #define WIDGET_CHIP_CTRL 0x15#define WIDGET_DSP_CTRL 0x16
sound/pci/hda/patch_cirrus.c +1 -0
@@ -26,6 +26,7 @@#include <sound/core.h> #include "hda_codec.h" #include "hda_local.h" +#include "hda_auto_parser.h" #include "hda_jack.h" #include <sound/tlv.h>
sound/pci/hda/patch_cmedia.c +1 -0
@@ -29,6 +29,7 @@#include <sound/core.h> #include "hda_codec.h" #include "hda_local.h" +#include "hda_auto_parser.h" #define NUM_PINS 11
sound/pci/hda/patch_sigmatel.c +1 -0
@@ -36,6 +36,7 @@#include <sound/tlv.h> #include "hda_codec.h" #include "hda_local.h" +#include "hda_auto_parser.h" #include "hda_beep.h" #include "hda_jack.h"
sound/pci/hda/patch_via.c +1 -0
@@ -54,6 +54,7 @@#include <sound/asoundef.h> #include "hda_codec.h" #include "hda_local.h" +#include "hda_auto_parser.h" #include "hda_jack.h" /* Pin Widget NID */
Signature · 1 line
1.7.9.2
PATCH 8/15 ALSA: hda - Remove pre_resume and post_suspend ops
In reply to Takashi IwaiSince the recent commit, the resume procedure is always performed at the resume time. This makes the pre_resume hack for VREF mute LED on some HP laptops superfluous. As this is the only user of pre_resume (and there is no user of post_suspend) ops, let's kill them again.
--- sound/pci/hda/hda_codec.c | 4 ---- sound/pci/hda/hda_codec.h | 2 -- sound/pci/hda/patch_sigmatel.c | 21 --------------------- 3 files changed, 27 deletions(-)
sound/pci/hda/hda_codec.c +0 -4
@@ -4930,8 +4930,6 @@ int snd_hda_suspend(struct hda_bus *bus)list_for_each_entry (codec, &bus->codec_list, list) {if (hda_codec_is_power_on (codec))hda_call_codec_suspend (codec); -if (codec->patch_ops.post_suspend) - codec->patch_ops.post_suspend (codec); }return 0 ; }
@@ -4951,8 +4949,6 @@ int snd_hda_resume(struct hda_bus *bus)struct hda_codec *codec;list_for_each_entry (codec, &bus->codec_list, list) { -if (codec->patch_ops.pre_resume) - codec->patch_ops.pre_resume (codec);hda_call_codec_resume (codec); }return 0 ;
sound/pci/hda/hda_codec.h +0 -2
@@ -704,8 +704,6 @@ struct hda_codec_ops { unsigned int power_state);#ifdef CONFIG_PM int (*suspend)(struct hda_codec *codec,pm_message_t state); -int (*post_suspend)(struct hda_codec *codec); -int (*pre_resume)(struct hda_codec *codec);int (*resume)(struct hda_codec *codec);#endif #ifdef CONFIG_SND_HDA_POWER_SAVE
sound/pci/hda/patch_sigmatel.c +0 -21
@@ -4986,20 +4986,6 @@ static int stac92xx_suspend(struct hda_codec *codec, pm_message_t state)return 0 ; } -static int stac92xx_pre_resume (struct hda_codec *codec) -{ -struct sigmatel_spec *spec = codec->spec; - -/* sync mute LED */ -if (spec->vref_mute_led_nid) -stac_vrefout_set (codec, spec->vref_mute_led_nid, - spec->vref_led); -else if (spec->gpio_led) -stac_gpio_set (codec, spec->gpio_mask, - spec->gpio_dir, spec->gpio_data); -return 0 ; -} -static void stac92xx_set_power_state (struct hda_codec *codec,hda_nid_t fg,unsigned int power_state) {
@@ -5023,7 +5009,6 @@ static void stac92xx_set_power_state(struct hda_codec *codec, hda_nid_t fg,#else #define stac92xx_suspend NULL#define stac92xx_resume NULL -#define stac92xx_pre_resume NULL#define stac92xx_set_power_state NULL#endif /* CONFIG_PM */
@@ -5569,9 +5554,6 @@ again: codec->patch_ops.set_power_state = stac92xx_set_power_state; } -#ifdef CONFIG_PM - codec->patch_ops.pre_resume = stac92xx_pre_resume; -#endif } err =stac92xx_parse_auto_config (codec);
@@ -5878,9 +5860,6 @@ again: codec->patch_ops.set_power_state = stac92xx_set_power_state; } -#ifdef CONFIG_PM - codec->patch_ops.pre_resume = stac92xx_pre_resume; -#endif } spec->multiout.dac_nids = spec->dac_nids;
Signature · 1 line
1.7.9.2
PATCH 9/15 ALSA: hda - More robustify the power-up/down sequence
In reply to Takashi IwaiCheck the power_transition up/down state instead of boolean bit, so that the power-up sequence can cancel the pending power-down work properly. Also, by moving cancel_delayed_work_sync() before the actual power-up sequence, make sure that the delayed power-down is completed.
--- sound/pci/hda/hda_codec.c | 22 +++++++++++++++------- sound/pci/hda/hda_codec.h | 2 +- 2 files changed, 16 insertions(+), 8 deletions(-)
sound/pci/hda/hda_codec.c +15 -7
@@ -2265,7 +2265,7 @@ int snd_hda_codec_reset(struct hda_codec *codec)/* OK, let it free */ #ifdef CONFIG_SND_HDA_POWER_SAVE -cancel_delayed_work (&codec->power_work); +cancel_delayed_work_sync (&codec->power_work); codec->power_on =0 ; codec->power_transition =0 ; codec->power_jiffies = jiffies;
@@ -3491,11 +3491,14 @@ static void hda_call_codec_suspend(struct hda_codec *codec) codec->afg ? codec->afg : codec->mfg, AC_PWRST_D3);#ifdef CONFIG_SND_HDA_POWER_SAVE -snd_hda_update_power_acct (codec);cancel_delayed_work (&codec->power_work); +spin_lock (&codec->power_lock); +snd_hda_update_power_acct (codec); +trace_hda_power_down (codec); codec->power_on =0 ; codec->power_transition =0 ; codec->power_jiffies = jiffies; +spin_unlock (&codec->power_lock);#endif }
@@ -4294,13 +4297,15 @@ static void hda_power_work(struct work_struct *work)struct hda_bus *bus = codec->bus;spin_lock (&codec->power_lock); +if (codec->power_transition >0 ) {/* during power-up sequence? */ +spin_unlock (&codec->power_lock); +return ; + }if (!codec->power_on || codec->power_count) { codec->power_transition =0 ;spin_unlock (&codec->power_lock);return ; } - -trace_hda_power_down (codec);spin_unlock (&codec->power_lock);hda_call_codec_suspend (codec);
@@ -4341,11 +4346,15 @@ void snd_hda_power_up(struct hda_codec *codec)spin_lock (&codec->power_lock); codec->power_count++; -if (codec->power_on || codec->power_transition) { +if (codec->power_on || codec->power_transition >0 ) {spin_unlock (&codec->power_lock);return ; } +spin_unlock (&codec->power_lock); +cancel_delayed_work_sync (&codec->power_work); + +spin_lock (&codec->power_lock);trace_hda_power_up (codec);snd_hda_update_power_acct (codec); codec->power_on =1 ;
@@ -4358,7 +4367,6 @@ void snd_hda_power_up(struct hda_codec *codec)hda_call_codec_resume (codec);spin_lock (&codec->power_lock); -cancel_delayed_work (&codec->power_work); codec->power_transition =0 ;spin_unlock (&codec->power_lock); }
@@ -4383,7 +4391,7 @@ void snd_hda_power_down(struct hda_codec *codec)return ; }if (power_save (codec)) { - codec->power_transition =1 ;/* avoid reentrance */ + codec->power_transition =-1 ;/* avoid reentrance */ queue_delayed_work (codec->bus->workq, &codec->power_work,msecs_to_jiffies (power_save (codec) *1000 )); }
sound/pci/hda/hda_codec.h +1 -1
@@ -859,7 +859,7 @@ struct hda_codec { unsigned int no_jack_detect:1; /* Machine has no jack-detection */#ifdef CONFIG_SND_HDA_POWER_SAVE unsigned int power_on :1; /* current (global) power-state */ - unsigned int power_transition :1; /* power-state in transition */ +int power_transition;/* power-state in transition */ int power_count;/* current (global) power refcount */ struct delayed_work power_work;/* delayed task for powerdown */ unsigned long power_on_acct;
Signature · 1 line
1.7.9.2
PATCH 10/15 ALSA: hda - Add the support for Creative SoundCore3D
In reply to Takashi IwaiThe controller is compatible with HD-audio 1.0a with some specific restrictions.
- The BDLE entries can't be over 4k boundary
- No position-buffer and no MSI
--- sound/pci/hda/hda_intel.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-)
sound/pci/hda/hda_intel.c +22 -4
@@ -497,6 +497,7 @@ enum {AZX_DRIVER_NVIDIA ,AZX_DRIVER_TERA ,AZX_DRIVER_CTX , +AZX_DRIVER_CTHDA ,AZX_DRIVER_GENERIC , AZX_NUM_DRIVERS, /* keep this as last entry */ };
@@ -518,6 +519,7 @@ enum {#define AZX_DCAPS_OLD_SSYNC (1 << 20)/* Old SSYNC reg for ICH */ #define AZX_DCAPS_BUFSIZE (1 << 21)/* no buffer size alignment */ #define AZX_DCAPS_ALIGN_BUFSIZE (1 << 22)/* buffer size alignment */ +#define AZX_DCAPS_4K_BDLE_BOUNDARY (1 << 23)/* BDLE in 4k boundary */ /* quirks for ATI SB / AMD Hudson */ #define AZX_DCAPS_PRESET_ATI_SB \
@@ -533,6 +535,9 @@ enum { (AZX_DCAPS_NVIDIA_SNOOP |AZX_DCAPS_RIRB_DELAY |AZX_DCAPS_NO_MSI |\ AZX_DCAPS_ALIGN_BUFSIZE) +#define AZX_DCAPS_PRESET_CTHDA \ + (AZX_DCAPS_NO_MSI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_4K_BDLE_BOUNDARY) +static char *driver_short_names[]__devinitdata = { [AZX_DRIVER_ICH ] ="HDA Intel" , [AZX_DRIVER_PCH ] ="HDA Intel PCH" ,
@@ -546,6 +551,7 @@ static char *driver_short_names[] __devinitdata = { [AZX_DRIVER_NVIDIA] = "HDA NVidia", [AZX_DRIVER_TERA] = "HDA Teradici", [AZX_DRIVER_CTX] = "HDA Creative", + [AZX_DRIVER_CTHDA] = "HDA Creative", [AZX_DRIVER_GENERIC] = "HD-Audio Generic", };
@@ -1283,7 +1289,8 @@ static irqreturn_t azx_interrupt(int irq, void *dev_id)/* * set up a BDL entry */ -static int setup_bdle (struct snd_pcm_substream *substream, +static int setup_bdle (struct azx *chip, +struct snd_pcm_substream *substream,struct azx_dev *azx_dev,u32 **bdlp,int ofs,int size,int with_ioc) {
@@ -1302,6 +1309,12 @@ static int setup_bdle(struct snd_pcm_substream *substream, bdl[1 ] =cpu_to_le32 (upper_32_bits (addr));/* program the size field of the BDL entry */ chunk =snd_pcm_sgbuf_get_chunk_size (substream, ofs, size); +/* one BDLE cannot cross 4K boundary on CTHDA chips */ +if (chip->driver_caps &AZX_DCAPS_4K_BDLE_BOUNDARY ) { +u32 remain =0x1000 - (ofs &0xfff ); +if (chunk > remain) + chunk = remain; + } bdl[2 ] =cpu_to_le32 (chunk);/* program the IOC to enable interrupt * only when the whole fragment is processed
@@ -1354,7 +1367,7 @@ static int azx_setup_periods(struct azx *chip, bdl_pos_adj[chip->dev_index]); pos_adj =0 ; }else { - ofs =setup_bdle (substream, azx_dev, + ofs =setup_bdle (chip, substream, azx_dev, &bdl, ofs, pos_adj, !substream->runtime->no_period_wakeup);if (ofs <0 )
@@ -1364,10 +1377,10 @@ static int azx_setup_periods(struct azx *chip, pos_adj =0 ;for (i =0 ; i < periods; i++) {if (i == periods -1 && pos_adj) - ofs =setup_bdle (substream, azx_dev, &bdl, ofs, + ofs =setup_bdle (chip, substream, azx_dev, &bdl, ofs, period_bytes - pos_adj,0 );else - ofs =setup_bdle (substream, azx_dev, &bdl, ofs, + ofs =setup_bdle (chip, substream, azx_dev, &bdl, ofs, period_bytes, !substream->runtime->no_period_wakeup);if (ofs <0 )
@@ -3116,6 +3129,11 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { .driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND | AZX_DCAPS_RIRB_PRE_DELAY | AZX_DCAPS_POSFIX_LPIB },#endif +/* CTHDA chips */ + { PCI_DEVICE(0x1102, 0x0010), + .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA }, + { PCI_DEVICE(0x1102, 0x0012), + .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA }, /* Vortex86MX */ { PCI_DEVICE(0x17f3, 0x3010), .driver_data = AZX_DRIVER_GENERIC },/* VMware HDAudio */
Signature · 1 line
1.7.9.2
PATCH 11/15 ALSA: hda - Add Conexant CX20751/2/3/4 codec support
In reply to Takashi IwaiThese are almost compatible with the older Conexant codecs.
--- sound/pci/hda/patch_conexant.c | 6 ++++++ 1 file changed, 6 insertions(+)
sound/pci/hda/patch_conexant.c +6 -0
@@ -4559,6 +4559,10 @@ static int patch_conexant_auto(struct hda_codec *codec)*/ static const struct hda_codec_preset snd_hda_preset_conexant[] = { + { .id =0x14f11510 , .name ="CX20751/2" , + .patch = patch_conexant_auto }, + { .id =0x14f11511 , .name ="CX20753/4" , + .patch = patch_conexant_auto }, { .id =0x14f15045 , .name ="CX20549 (Venice)" , .patch = patch_cxt5045 }, { .id =0x14f15047 , .name ="CX20551 (Waikiki)" ,
@@ -4596,6 +4600,8 @@ static const struct hda_codec_preset snd_hda_preset_conexant[] = { {}/* terminator */ }; +MODULE_ALIAS ("snd-hda-codec-id:14f11510" ); +MODULE_ALIAS ("snd-hda-codec-id:14f11511" );MODULE_ALIAS ("snd-hda-codec-id:14f15045" );MODULE_ALIAS ("snd-hda-codec-id:14f15047" );MODULE_ALIAS ("snd-hda-codec-id:14f15051" );
Signature · 1 line
1.7.9.2
PATCH 12/15 ALSA: hda - Protect SPDIF-related stuff via spdif_mutex
In reply to Takashi IwaiAdd the missing mutex protection or move into the protected part for SPDIF access codes for codecs.
--- sound/pci/hda/hda_codec.c | 35 +++++++++++++++++++++++++---------- sound/pci/hda/patch_hdmi.c | 4 ++-- 2 files changed, 27 insertions(+), 12 deletions(-)
sound/pci/hda/hda_codec.c +25 -10
@@ -2864,12 +2864,15 @@ static int snd_hda_spdif_default_get(struct snd_kcontrol *kcontrol, {struct hda_codec *codec =snd_kcontrol_chip (kcontrol);int idx = kcontrol->private_value; -struct hda_spdif_out *spdif =snd_array_elem (&codec->spdif_out, idx); +struct hda_spdif_out *spdif; +mutex_lock (&codec->spdif_mutex); + spdif =snd_array_elem (&codec->spdif_out, idx); ucontrol->value.iec958.status[0 ] = spdif->status &0xff ; ucontrol->value.iec958.status[1 ] = (spdif->status >>8 ) &0xff ; ucontrol->value.iec958.status[2 ] = (spdif->status >>16 ) &0xff ; ucontrol->value.iec958.status[3 ] = (spdif->status >>24 ) &0xff ; +mutex_unlock (&codec->spdif_mutex);return 0 ; }
@@ -2955,12 +2958,14 @@ static int snd_hda_spdif_default_put(struct snd_kcontrol *kcontrol, {struct hda_codec *codec =snd_kcontrol_chip (kcontrol);int idx = kcontrol->private_value; -struct hda_spdif_out *spdif =snd_array_elem (&codec->spdif_out, idx); -hda_nid_t nid = spdif->nid; +struct hda_spdif_out *spdif; +hda_nid_t nid;unsigned short val;int change;mutex_lock (&codec->spdif_mutex); + spdif =snd_array_elem (&codec->spdif_out, idx); + nid = spdif->nid; spdif->status = ucontrol->value.iec958.status[0 ] | ((unsigned int )ucontrol->value.iec958.status[1 ] <<8 ) | ((unsigned int)ucontrol->value.iec958.status[2] << 16) |
@@ -2982,9 +2987,12 @@ static int snd_hda_spdif_out_switch_get(struct snd_kcontrol *kcontrol, {struct hda_codec *codec =snd_kcontrol_chip (kcontrol);int idx = kcontrol->private_value; -struct hda_spdif_out *spdif =snd_array_elem (&codec->spdif_out, idx); +struct hda_spdif_out *spdif; +mutex_lock (&codec->spdif_mutex); + spdif =snd_array_elem (&codec->spdif_out, idx); ucontrol->value.integer.value[0 ] = spdif->ctls &AC_DIG1_ENABLE ; +mutex_unlock (&codec->spdif_mutex);return 0 ; }
@@ -3004,12 +3012,14 @@ static int snd_hda_spdif_out_switch_put(struct snd_kcontrol *kcontrol, {struct hda_codec *codec =snd_kcontrol_chip (kcontrol);int idx = kcontrol->private_value; -struct hda_spdif_out *spdif =snd_array_elem (&codec->spdif_out, idx); -hda_nid_t nid = spdif->nid; +struct hda_spdif_out *spdif; +hda_nid_t nid;unsigned short val;int change;mutex_lock (&codec->spdif_mutex); + spdif =snd_array_elem (&codec->spdif_out, idx); + nid = spdif->nid; val = spdif->ctls & ~AC_DIG1_ENABLE ;if (ucontrol->value.integer.value[0 ]) val |=AC_DIG1_ENABLE ;
@@ -3097,6 +3107,9 @@ int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, }EXPORT_SYMBOL_HDA (snd_hda_create_spdif_out_ctls); +/* get the hda_spdif_out entry from the given NID +* call within spdif_mutex lock +*/ struct hda_spdif_out *snd_hda_spdif_out_of_nid (struct hda_codec *codec,hda_nid_t nid) {
@@ -3113,9 +3126,10 @@ EXPORT_SYMBOL_HDA(snd_hda_spdif_out_of_nid);void snd_hda_spdif_ctls_unassign (struct hda_codec *codec,int idx) { -struct hda_spdif_out *spdif =snd_array_elem (&codec->spdif_out, idx); +struct hda_spdif_out *spdif;mutex_lock (&codec->spdif_mutex); + spdif =snd_array_elem (&codec->spdif_out, idx); spdif->nid = (u16)-1 ;mutex_unlock (&codec->spdif_mutex); }
@@ -3123,10 +3137,11 @@ EXPORT_SYMBOL_HDA(snd_hda_spdif_ctls_unassign);void snd_hda_spdif_ctls_assign (struct hda_codec *codec,int idx,hda_nid_t nid) { -struct hda_spdif_out *spdif =snd_array_elem (&codec->spdif_out, idx); +struct hda_spdif_out *spdif;unsigned short val;mutex_lock (&codec->spdif_mutex); + spdif =snd_array_elem (&codec->spdif_out, idx);if (spdif->nid != nid) { spdif->nid = nid; val = spdif->ctls;
@@ -4747,11 +4762,11 @@ int snd_hda_multi_out_analog_prepare(struct hda_codec *codec, {const hda_nid_t *nids = mout->dac_nids;int chs = substream->runtime->channels; -struct hda_spdif_out *spdif = -snd_hda_spdif_out_of_nid (codec, mout->dig_out_nid); +struct hda_spdif_out *spdif;int i;mutex_lock (&codec->spdif_mutex); + spdif =snd_hda_spdif_out_of_nid (codec, mout->dig_out_nid);if (mout->dig_out_nid && mout->share_spdif && mout->dig_out_used !=HDA_DIG_EXCLUSIVE ) { if (chs == 2 &&
sound/pci/hda/patch_hdmi.c +2 -2
@@ -1592,10 +1592,10 @@ static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo,unsigned int dataDCC2, channel_id;int i;struct hdmi_spec *spec = codec->spec; -struct hda_spdif_out *spdif = -snd_hda_spdif_out_of_nid (codec, spec->cvts[0 ].cvt_nid); +struct hda_spdif_out *spdif;mutex_lock (&codec->spdif_mutex); + spdif =snd_hda_spdif_out_of_nid (codec, spec->cvts[0 ].cvt_nid); chs = substream->runtime->channels;
Signature · 1 line
1.7.9.2
PATCH 13/15 ALSA: hda - Fix concurrent hash accesses
In reply to Takashi IwaiThe amp and caps hashes aren't protected properly for concurrent accesses. Protect them via a new mutex now.
But it can't be so simple as originally thought: since the update of a hash table entry itself might trigger the power-up sequence which again accesses the hash table, we can't cover the whole function simply via mutex. Thus the update part has to be split from the mutex and revalidated.
--- sound/pci/hda/hda_codec.c | 201 +++++++++++++++++++++++++++------------------ sound/pci/hda/hda_codec.h | 1 + 2 files changed, 121 insertions(+), 81 deletions(-)
sound/pci/hda/hda_codec.c +120 -81
@@ -1255,6 +1255,7 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, codec->addr = codec_addr;mutex_init (&codec->spdif_mutex);mutex_init (&codec->control_mutex); +mutex_init (&codec->hash_mutex);init_hda_cache (&codec->amp_cache,sizeof (struct hda_amp_info ));init_hda_cache (&codec->cmd_cache,sizeof (struct hda_cache_head ));snd_array_init (&codec->mixers,sizeof (struct hda_nid_item ),32 );
@@ -1605,6 +1606,60 @@ get_alloc_amp_hash(struct hda_codec *codec, u32 key)return (struct hda_amp_info *)get_alloc_hash (&codec->amp_cache, key); } +/* overwrite the value with the key in the caps hash */ +static int write_caps_hash (struct hda_codec *codec,u32 key,unsigned int val) +{ +struct hda_amp_info *info; + +mutex_lock (&codec->hash_mutex); + info =get_alloc_amp_hash (codec, key); +if (!info) { +mutex_unlock (&codec->hash_mutex); +return -EINVAL ; + } + info->amp_caps = val; + info->head.val |=INFO_AMP_CAPS ; +mutex_unlock (&codec->hash_mutex); +return 0 ; +} + +/* query the value from the caps hash; if not found, fetch the current +* value from the given function and store in the hash +*/ +static unsigned int +query_caps_hash (struct hda_codec *codec,hda_nid_t nid,int dir,u32 key, +unsigned int (*func)(struct hda_codec *,hda_nid_t ,int )) +{ +struct hda_amp_info *info; +unsigned int val; + +mutex_lock (&codec->hash_mutex); + info =get_alloc_amp_hash (codec, key); +if (!info) { +mutex_unlock (&codec->hash_mutex); +return 0 ; + } +if (!(info->head.val &INFO_AMP_CAPS )) { +mutex_unlock (&codec->hash_mutex);/* for reentrance */ + val =func (codec, nid, dir); +write_caps_hash (codec, key, val); + }else { + val = info->amp_caps; +mutex_unlock (&codec->hash_mutex); + } +return val; +} + +static unsigned int read_amp_cap (struct hda_codec *codec,hda_nid_t nid, +int direction) +{ +if (!(get_wcaps (codec, nid) &AC_WCAP_AMP_OVRD )) + nid = codec->afg; +return snd_hda_param_read (codec, nid, + direction ==HDA_OUTPUT ? +AC_PAR_AMP_OUT_CAP :AC_PAR_AMP_IN_CAP ); +} +/** * query_amp_caps - query AMP capabilities * @codec: the HD-auio codec
@@ -1619,22 +1674,9 @@ get_alloc_amp_hash(struct hda_codec *codec, u32 key)*/ u32 query_amp_caps (struct hda_codec *codec,hda_nid_t nid,int direction) { -struct hda_amp_info *info; - - info =get_alloc_amp_hash (codec,HDA_HASH_KEY (nid, direction,0 )); -if (!info) -return 0 ; -if (!(info->head.val &INFO_AMP_CAPS )) { -if (!(get_wcaps (codec, nid) &AC_WCAP_AMP_OVRD )) - nid = codec->afg; - info->amp_caps =snd_hda_param_read (codec, nid, - direction ==HDA_OUTPUT ? -AC_PAR_AMP_OUT_CAP : -AC_PAR_AMP_IN_CAP ); -if (info->amp_caps) - info->head.val |=INFO_AMP_CAPS ; - } -return info->amp_caps; +return query_caps_hash (codec, nid, direction, +HDA_HASH_KEY (nid, direction,0 ), + read_amp_cap); }EXPORT_SYMBOL_HDA (query_amp_caps);
@@ -1654,34 +1696,12 @@ EXPORT_SYMBOL_HDA(query_amp_caps);int snd_hda_override_amp_caps (struct hda_codec *codec,hda_nid_t nid,int dir,unsigned int caps) { -struct hda_amp_info *info; - - info =get_alloc_amp_hash (codec,HDA_HASH_KEY (nid, dir,0 )); -if (!info) -return -EINVAL ; - info->amp_caps = caps; - info->head.val |=INFO_AMP_CAPS ; -return 0 ; +return write_caps_hash (codec,HDA_HASH_KEY (nid, dir,0 ), caps); }EXPORT_SYMBOL_HDA (snd_hda_override_amp_caps); -static unsigned int -query_caps_hash (struct hda_codec *codec,hda_nid_t nid,u32 key, -unsigned int (*func)(struct hda_codec *,hda_nid_t )) -{ -struct hda_amp_info *info; - - info =get_alloc_amp_hash (codec, key); -if (!info) -return 0 ; -if (!info->head.val) { - info->head.val |=INFO_AMP_CAPS ; - info->amp_caps =func (codec, nid); - } -return info->amp_caps; -} - -static unsigned int read_pin_cap (struct hda_codec *codec,hda_nid_t nid) +static unsigned int read_pin_cap (struct hda_codec *codec,hda_nid_t nid, +int dir) {return snd_hda_param_read (codec, nid,AC_PAR_PIN_CAP ); }
@@ -1699,7 +1719,7 @@ static unsigned int read_pin_cap(struct hda_codec *codec, hda_nid_t nid)*/ u32 snd_hda_query_pin_caps (struct hda_codec *codec,hda_nid_t nid) { -return query_caps_hash (codec, nid,HDA_HASH_PINCAP_KEY (nid), +return query_caps_hash (codec, nid,0 ,HDA_HASH_PINCAP_KEY (nid), read_pin_cap); }EXPORT_SYMBOL_HDA (snd_hda_query_pin_caps);
@@ -1717,41 +1737,47 @@ EXPORT_SYMBOL_HDA(snd_hda_query_pin_caps);int snd_hda_override_pin_caps (struct hda_codec *codec,hda_nid_t nid,unsigned int caps) { -struct hda_amp_info *info; - info =get_alloc_amp_hash (codec,HDA_HASH_PINCAP_KEY (nid)); -if (!info) -return -ENOMEM ; - info->amp_caps = caps; - info->head.val |=INFO_AMP_CAPS ; -return 0 ; +return write_caps_hash (codec,HDA_HASH_PINCAP_KEY (nid), caps); }EXPORT_SYMBOL_HDA (snd_hda_override_pin_caps); -/* -* read the current volume to info -* if the cache exists, read the cache value. +/* read or sync the hash value with the current value; +* call within hash_mutex */ -static unsigned int get_vol_mute (struct hda_codec *codec, -struct hda_amp_info *info,hda_nid_t nid, -int ch,int direction,int index) +static struct hda_amp_info * +update_amp_hash (struct hda_codec *codec,hda_nid_t nid,int ch, +int direction,int index) { -u32 val, parm; - -if (info->head.val &INFO_AMP_VOL (ch)) -return info->vol[ch]; +struct hda_amp_info *info; +unsigned int parm, val =0 ; +bool val_read = false; - parm = ch ?AC_AMP_GET_RIGHT :AC_AMP_GET_LEFT ; - parm |= direction ==HDA_OUTPUT ?AC_AMP_GET_OUTPUT :AC_AMP_GET_INPUT ; - parm |= index; - val =snd_hda_codec_read (codec, nid,0 , + retry: + info =get_alloc_amp_hash (codec,HDA_HASH_KEY (nid, direction, index)); +if (!info) +return NULL ; +if (!(info->head.val &INFO_AMP_VOL (ch))) { +if (!val_read) { +mutex_unlock (&codec->hash_mutex); + parm = ch ?AC_AMP_GET_RIGHT :AC_AMP_GET_LEFT ; + parm |= direction ==HDA_OUTPUT ? +AC_AMP_GET_OUTPUT :AC_AMP_GET_INPUT ; + parm |= index; + val =snd_hda_codec_read (codec, nid,0 ,AC_VERB_GET_AMP_GAIN_MUTE , parm); - info->vol[ch] = val &0xff ; - info->head.val |=INFO_AMP_VOL (ch); -return info->vol[ch]; + val &=0xff ; + val_read = true; +mutex_lock (&codec->hash_mutex); + goto retry; + } + info->vol[ch] = val; + info->head.val |=INFO_AMP_VOL (ch); + } +return info; }/* -* write the current volume in info to the h/w and update the cache +* write the current volume in info to the h/w */ static void put_vol_mute(struct hda_codec *codec, struct hda_amp_info *info, hda_nid_t nid, int ch, int direction, int index,
@@ -1768,7 +1794,6 @@ static void put_vol_mute(struct hda_codec *codec, struct hda_amp_info *info,else parm |= val;snd_hda_codec_write (codec, nid,0 ,AC_VERB_SET_AMP_GAIN_MUTE , parm); - info->vol[ch] = val; }/**
@@ -1785,10 +1810,14 @@ int snd_hda_codec_amp_read(struct hda_codec *codec, hda_nid_t nid, int ch, int direction, int index) {struct hda_amp_info *info; - info =get_alloc_amp_hash (codec,HDA_HASH_KEY (nid, direction, index)); -if (!info) -return 0 ; -return get_vol_mute (codec, info, nid, ch, direction, index); +unsigned int val =0 ; + +mutex_lock (&codec->hash_mutex); + info =update_amp_hash (codec, nid, ch, direction, index); +if (info) + val = info->vol[ch]; +mutex_unlock (&codec->hash_mutex); +return val; }EXPORT_SYMBOL_HDA (snd_hda_codec_amp_read);
@@ -1810,15 +1839,23 @@ int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int ch, {struct hda_amp_info *info; - info =get_alloc_amp_hash (codec,HDA_HASH_KEY (nid, direction, idx)); -if (!info) -return 0 ;if (snd_BUG_ON (mask & ~0xff )) mask &=0xff ; val &= mask; - val |=get_vol_mute (codec, info, nid, ch, direction, idx) & ~mask; -if (info->vol[ch] == val) + +mutex_lock (&codec->hash_mutex); + info =update_amp_hash (codec, nid, ch, direction, idx); +if (!info) { +mutex_unlock (&codec->hash_mutex); +return 0 ; + } + val |= info->vol[ch] & ~mask; +if (info->vol[ch] == val) { +mutex_unlock (&codec->hash_mutex);return 0 ; + } + info->vol[ch] = val; +mutex_unlock (&codec->hash_mutex);put_vol_mute (codec, info, nid, ch, direction, idx, val);return 1 ; }
@@ -3693,7 +3730,8 @@ unsigned int snd_hda_calc_stream_format(unsigned int rate, }EXPORT_SYMBOL_HDA (snd_hda_calc_stream_format); -static unsigned int get_pcm_param (struct hda_codec *codec,hda_nid_t nid) +static unsigned int get_pcm_param (struct hda_codec *codec,hda_nid_t nid, +int dir) {unsigned int val =0 ; if (nid != codec->afg &&
@@ -3708,11 +3746,12 @@ static unsigned int get_pcm_param(struct hda_codec *codec, hda_nid_t nid)static unsigned int query_pcm_param (struct hda_codec *codec,hda_nid_t nid) { -return query_caps_hash (codec, nid,HDA_HASH_PARPCM_KEY (nid), +return query_caps_hash (codec, nid,0 ,HDA_HASH_PARPCM_KEY (nid), get_pcm_param); } -static unsigned int get_stream_param (struct hda_codec *codec,hda_nid_t nid) +static unsigned int get_stream_param (struct hda_codec *codec,hda_nid_t nid, +int dir) {unsigned int streams =snd_hda_param_read (codec, nid,AC_PAR_STREAM );if (!streams || streams ==-1 )
@@ -3724,7 +3763,7 @@ static unsigned int get_stream_param(struct hda_codec *codec, hda_nid_t nid)static unsigned int query_stream_param (struct hda_codec *codec,hda_nid_t nid) { -return query_caps_hash (codec, nid,HDA_HASH_PARSTR_KEY (nid), +return query_caps_hash (codec, nid,0 ,HDA_HASH_PARSTR_KEY (nid), get_stream_param); }
sound/pci/hda/hda_codec.h +1 -0
@@ -827,6 +827,7 @@ struct hda_codec {struct mutex spdif_mutex;struct mutex control_mutex; +struct mutex hash_mutex;struct snd_array spdif_out;unsigned int spdif_in_enable;/* SPDIF input enable? */ const hda_nid_t *slave_dig_outs;/* optional digital out slave widgets */
Signature · 1 line
1.7.9.2
PATCH 14/15 ALSA: hda/conexant - Correct vendor IDs for new codecs
In reply to Takashi IwaiNever trust datasheet...
--- sound/pci/hda/patch_conexant.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
sound/pci/hda/patch_conexant.c +9 -6
@@ -4559,10 +4559,6 @@ static int patch_conexant_auto(struct hda_codec *codec)*/ static const struct hda_codec_preset snd_hda_preset_conexant[] = { - { .id =0x14f11510 , .name ="CX20751/2" , - .patch = patch_conexant_auto }, - { .id =0x14f11511 , .name ="CX20753/4" , - .patch = patch_conexant_auto }, { .id =0x14f15045 , .name ="CX20549 (Venice)" , .patch = patch_cxt5045 }, { .id =0x14f15047 , .name ="CX20551 (Waikiki)" ,
@@ -4597,11 +4593,15 @@ static const struct hda_codec_preset snd_hda_preset_conexant[] = { .patch = patch_conexant_auto }, { .id = 0x14f150b9, .name = "CX20665", .patch = patch_conexant_auto }, + { .id = 0x14f1510f, .name = "CX20751/2", + .patch = patch_conexant_auto }, + { .id = 0x14f15110, .name = "CX20751/2", + .patch = patch_conexant_auto }, + { .id = 0x14f15111, .name = "CX20753/4", + .patch = patch_conexant_auto }, {}/* terminator */ }; -MODULE_ALIAS ("snd-hda-codec-id:14f11510" ); -MODULE_ALIAS ("snd-hda-codec-id:14f11511" );MODULE_ALIAS ("snd-hda-codec-id:14f15045" );MODULE_ALIAS ("snd-hda-codec-id:14f15047" );MODULE_ALIAS ("snd-hda-codec-id:14f15051" );
@@ -4619,6 +4619,9 @@ MODULE_ALIAS("snd-hda-codec-id:14f150ab");MODULE_ALIAS ("snd-hda-codec-id:14f150ac" );MODULE_ALIAS ("snd-hda-codec-id:14f150b8" );MODULE_ALIAS ("snd-hda-codec-id:14f150b9" ); +MODULE_ALIAS ("snd-hda-codec-id:14f1510f" ); +MODULE_ALIAS ("snd-hda-codec-id:14f15110" ); +MODULE_ALIAS ("snd-hda-codec-id:14f15111" );MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Conexant HD-audio codec" );
Signature · 1 line
1.7.9.2
PATCH 15/15 ALSA: hda - Disable FLOAT format support
In reply to Takashi IwaiIt turned out that the FLOAT format on CS4206 results in simple noises, which implies that this is no right format as is. Since CS4206 is the only codec supporting the float, let's disable it until we find the correct format.
--- sound/pci/hda/hda_codec.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/hda_codec.c +2 -0
@@ -3842,11 +3842,13 @@ int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid, bps =20 ; } } +#if 0 /* FIXME: CS4206 doesn't work, which is the only codec supporting float */ if (streams &AC_SUPFMT_FLOAT32 ) { formats |=SNDRV_PCM_FMTBIT_FLOAT_LE ;if (!bps) bps =32 ; } +#endif if (streams ==AC_SUPFMT_AC3 ) {/* should be exclusive */ /* temporary hack: we have still no proper support
Signature · 1 line
1.7.9.2