sound fix for 2.6.35-rc5
Linus,
please pull an HD-audio fix for v2.6.35-rc5 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git fix/hda
This is a regression fix since 2.6.34.
Thanks!
Takashi
===
Takashi Iwai (1):
ALSA: hda - Restore cleared pin controls on resume
--- sound/pci/hda/hda_codec.c | 27 +++++++++++++++++++++++++++ sound/pci/hda/hda_codec.h | 5 ++++- 2 files changed, 31 insertions(+), 1 deletions(-)
sound/pci/hda/hda_codec.c +27 -0
@@ -784,6 +784,9 @@ static int read_pin_defaults(struct hda_codec *codec) pin->nid = nid; pin->cfg =snd_hda_codec_read (codec, nid,0 ,AC_VERB_GET_CONFIG_DEFAULT ,0 ); + pin->ctrl =snd_hda_codec_read (codec, nid,0 , +AC_VERB_GET_PIN_WIDGET_CONTROL , +0 ); }return 0 ; }
@@ -912,15 +915,38 @@ static void restore_pincfgs(struct hda_codec *codec)void snd_hda_shutup_pins (struct hda_codec *codec) {int i; +/* don't shut up pins when unloading the driver; otherwise it breaks +* the default pin setup at the next load of the driver +*/ +if (codec->bus->shutdown) +return ;for (i =0 ; i < codec->init_pins.used; i++) {struct hda_pincfg *pin =snd_array_elem (&codec->init_pins, i);/* use read here for syncing after issuing each verb */ snd_hda_codec_read (codec, pin->nid,0 ,AC_VERB_SET_PIN_WIDGET_CONTROL ,0 ); } + codec->pins_shutup =1 ; }EXPORT_SYMBOL_HDA (snd_hda_shutup_pins); +/* Restore the pin controls cleared previously via snd_hda_shutup_pins() */ +static void restore_shutup_pins (struct hda_codec *codec) +{ +int i; +if (!codec->pins_shutup) +return ; +if (codec->bus->shutdown) +return ; +for (i =0 ; i < codec->init_pins.used; i++) { +struct hda_pincfg *pin =snd_array_elem (&codec->init_pins, i); +snd_hda_codec_write (codec, pin->nid,0 , +AC_VERB_SET_PIN_WIDGET_CONTROL , + pin->ctrl); + } + codec->pins_shutup =0 ; +} +static void init_hda_cache (struct hda_cache_rec *cache,unsigned int record_size);static void free_hda_cache (struct hda_cache_rec *cache);
@@ -2907,6 +2933,7 @@ static void hda_call_codec_resume(struct hda_codec *codec) codec->afg ? codec->afg : codec->mfg, AC_PWRST_D0);restore_pincfgs (codec);/* restore all current pin configs */ +restore_shutup_pins (codec);hda_exec_init_verbs (codec);if (codec->patch_ops.resume) codec->patch_ops.resume (codec);
sound/pci/hda/hda_codec.h +4 -1
@@ -821,6 +821,7 @@ struct hda_codec { unsigned int pin_amp_workaround:1; /* pin out-amp takes index* (e.g. Conexant codecs) */ + unsigned int pins_shutup:1; /* pins are shut up */ unsigned int no_trigger_sense:1; /* don't trigger at pin-sensing */#ifdef CONFIG_SND_HDA_POWER_SAVE unsigned int power_on :1; /* current (global) power-state */
@@ -897,7 +898,9 @@ void snd_hda_codec_resume_cache(struct hda_codec *codec);/* the struct for codec->pin_configs */ struct hda_pincfg {hda_nid_t nid; -unsigned int cfg; +unsigned char ctrl;/* current pin control value */ +unsigned char pad;/* reserved */ +unsigned int cfg;/* default configuration */ };unsigned int snd_hda_codec_get_pincfg (struct hda_codec *codec,hda_nid_t nid);