sound (HD-audio) fixes
Linus,
please pull ALSA HD-audio fixes for v2.6.31-rc5 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git fix/hda
This is the fixes only for HD-audio, thus a different (sub-)branch is used. It contains the following fixes.
Thanks!
Takashi
===
Chengu Wang (1):
ALSA: hda: Correct EAPD for Dell Inspiron 1525
Roel Kluin (1):
ALSA: hda - Read buffer overflow
Takashi Iwai (1):
ALSA: hda - Fix quirk for Toshiba Satellite A135-S4527
Wu Fengguang (6):
ALSA: hda: track CIRB/CORB command/response states for each codec
ALSA: hda: take cmd_mutex in probe_codec()
ALSA: hda: take reg_lock in azx_init_cmd_io/azx_free_cmd_io
ALSA: hda: read CORBWP inside reg_lock
ALSA: hda: remember last command for each codec
ALSA: hda: warn on spurious response
--- sound/pci/hda/hda_codec.c | 2 +- sound/pci/hda/hda_codec.h | 2 +- sound/pci/hda/hda_intel.c | 103 ++++++++++++++++++++++++++++----------- sound/pci/hda/patch_realtek.c | 4 +- sound/pci/hda/patch_sigmatel.c | 9 +++- 5 files changed, 86 insertions(+), 34 deletions(-)
sound/pci/hda/hda_codec.c +1 -1
@@ -174,7 +174,7 @@ static int codec_exec_verb(struct hda_codec *codec, unsigned int cmd,mutex_lock (&bus->cmd_mutex); err = bus->ops.command (bus, cmd);if (!err && res) - *res = bus->ops.get_response (bus); + *res = bus->ops.get_response (bus, codec->addr);mutex_unlock (&bus->cmd_mutex);snd_hda_power_down (codec);if (res && *res ==-1 && bus->rirb_error) {
sound/pci/hda/hda_codec.h +1 -1
@@ -568,7 +568,7 @@ struct hda_bus_ops {/* send a single command */ int (*command)(struct hda_bus *bus,unsigned int cmd);/* get a response from the last command */ -unsigned int (*get_response)(struct hda_bus *bus); +unsigned int (*get_response)(struct hda_bus *bus,unsigned int addr);/* free the private data */ void (*private_free)(struct hda_bus *);/* attach a PCM stream */
sound/pci/hda/hda_intel.c +74 -29
275 lines not on this page · raw message
sound/pci/hda/patch_realtek.c +2 -2
@@ -559,7 +559,7 @@ static int alc_pin_mode_get(struct snd_kcontrol *kcontrol,/* Find enumerated value for current pinctl setting */ i =alc_pin_mode_min (dir); -while (alc_pin_mode_values[i] != pinctl && i <=alc_pin_mode_max (dir)) +while (i <=alc_pin_mode_max (dir) && alc_pin_mode_values[i] != pinctl) i++; *valp = i <=alc_pin_mode_max (dir) ? i:alc_pin_mode_min (dir);return 0 ;
@@ -15157,7 +15157,7 @@ static struct snd_pci_quirk alc861vd_cfg_tbl[] = {SND_PCI_QUIRK (0x10de ,0x03f0 ,"Realtek ALC660 demo" ,ALC660VD_3ST ),SND_PCI_QUIRK (0x1179 ,0xff00 ,"Toshiba A135" ,ALC861VD_LENOVO ),/*SND_PCI_QUIRK(0x1179, 0xff00, "DALLAS", ALC861VD_DALLAS),*/ /*lenovo*/ -SND_PCI_QUIRK (0x1179 ,0xff01 ,"DALLAS" ,ALC861VD_DALLAS ), +SND_PCI_QUIRK (0x1179 ,0xff01 ,"Toshiba A135" ,ALC861VD_LENOVO ),SND_PCI_QUIRK (0x1179 ,0xff03 ,"Toshiba P205" ,ALC861VD_LENOVO ),SND_PCI_QUIRK (0x1179 ,0xff31 ,"Toshiba L30-149" ,ALC861VD_DALLAS ), SND_PCI_QUIRK(0x1565, 0x820d, "Biostar NF61S SE", ALC861VD_6ST_DIG),
sound/pci/hda/patch_sigmatel.c +8 -1
@@ -2266,7 +2266,7 @@ static struct snd_pci_quirk stac927x_cfg_tbl[] = {SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x01f3 ,"Dell Inspiron 1420" ,STAC_DELL_BIOS ),SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x0227 ,"Dell Vostro 1400 " ,STAC_DELL_BIOS ),SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x022e ,"Dell " ,STAC_DELL_BIOS ), -SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x022f ,"Dell Inspiron 1525" ,STAC_DELL_3ST ), +SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x022f ,"Dell Inspiron 1525" ,STAC_DELL_BIOS ),SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x0242 ,"Dell " ,STAC_DELL_BIOS ),SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x0243 ,"Dell " ,STAC_DELL_BIOS ), SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02ff, "Dell ", STAC_DELL_BIOS),
@@ -5645,6 +5645,13 @@ static int patch_stac927x(struct hda_codec *codec)/* GPIO2 High = Enable EAPD */ spec->eapd_mask = spec->gpio_mask = spec->gpio_dir =0x04 ; spec->gpio_data =0x04 ; +switch (codec->subsystem_id) { +case 0x1028022f : +/* correct EAPD to be GPIO0 */ + spec->eapd_mask = spec->gpio_mask =0x01 ; + spec->gpio_dir = spec->gpio_data =0x01 ; +break ; + }; spec->dmic_nids = stac927x_dmic_nids; spec->num_dmics =STAC927X_NUM_DMICS ;