dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Merge branch 'fix/hda' into topic/hda

This commit is contained in:
Takashi Iwai 2010-02-05 09:09:25 +01:00
parent cec27c891b 9492837a6f
commit 794d620650
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sound/pci/hda/hda_intel.c
View File

@ -425,6 +425,7 @@ struct azx {
/* flags */ /* flags */
int position_fix; int position_fix;
int poll_count;
unsigned int running :1; unsigned int running :1;
unsigned int initialized :1; unsigned int initialized :1;
unsigned int single_cmd :1; unsigned int single_cmd :1;
@ -505,7 +506,7 @@ static char *driver_short_names[] __devinitdata = {
#define get_azx_dev(substream) (substream->runtime->private_data) #define get_azx_dev(substream) (substream->runtime->private_data)
static int azx_acquire_irq(struct azx *chip, int do_disconnect); static int azx_acquire_irq(struct azx *chip, int do_disconnect);
static int azx_send_cmd(struct hda_bus *bus, unsigned int val);
/* /*
* Interface for HD codec * Interface for HD codec
*/ */
@ -663,11 +664,12 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus,
{ {
struct azx *chip = bus->private_data; struct azx *chip = bus->private_data;
unsigned long timeout; unsigned long timeout;
int do_poll = 0;
again: again:
timeout = jiffies + msecs_to_jiffies(1000); timeout = jiffies + msecs_to_jiffies(1000);
for (;;) { for (;;) {
if (chip->polling_mode) { if (chip->polling_mode || do_poll) {
spin_lock_irq(&chip->reg_lock); spin_lock_irq(&chip->reg_lock);
azx_update_rirb(chip); azx_update_rirb(chip);
spin_unlock_irq(&chip->reg_lock); spin_unlock_irq(&chip->reg_lock);
@ -675,6 +677,9 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus,
if (!chip->rirb.cmds[addr]) { if (!chip->rirb.cmds[addr]) {
smp_rmb(); smp_rmb();
bus->rirb_error = 0; bus->rirb_error = 0;
if (!do_poll)
chip->poll_count = 0;
return chip->rirb.res[addr]; /* the last value */ return chip->rirb.res[addr]; /* the last value */
} }
if (time_after(jiffies, timeout)) if (time_after(jiffies, timeout))
@ -687,6 +692,16 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus,
} }
} }
if (!chip->polling_mode && chip->poll_count < 2) {
snd_printdd(SFX "azx_get_response timeout, "
"polling the codec once: last cmd=0x%08x\n",
chip->last_cmd[addr]);
do_poll = 1;
chip->poll_count++;
goto again;
}
if (!chip->polling_mode) { if (!chip->polling_mode) {
snd_printk(KERN_WARNING SFX "azx_get_response timeout, " snd_printk(KERN_WARNING SFX "azx_get_response timeout, "
"switching to polling mode: last cmd=0x%08x\n", "switching to polling mode: last cmd=0x%08x\n",
@ -2042,7 +2057,7 @@ static int azx_acquire_irq(struct azx *chip, int do_disconnect)
{ {
if (request_irq(chip->pci->irq, azx_interrupt, if (request_irq(chip->pci->irq, azx_interrupt,
chip->msi ? 0 : IRQF_SHARED, chip->msi ? 0 : IRQF_SHARED,
"HDA Intel", chip)) { "hda_intel", chip)) {
printk(KERN_ERR "hda-intel: unable to grab IRQ %d, " printk(KERN_ERR "hda-intel: unable to grab IRQ %d, "
"disabling device\n", chip->pci->irq); "disabling device\n", chip->pci->irq);
if (do_disconnect) if (do_disconnect)
@ -2331,6 +2346,7 @@ static void __devinit check_probe_mask(struct azx *chip, int dev)
*/ */
static struct snd_pci_quirk msi_black_list[] __devinitdata = { static struct snd_pci_quirk msi_black_list[] __devinitdata = {
SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */ SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */
SND_PCI_QUIRK(0x1043, 0x829c, "ASUS", 0), /* nvidia */
{} {}
}; };

7
sound/pci/hda/patch_realtek.c
View File

@ -9514,6 +9514,7 @@ static struct alc_config_preset alc882_presets[] = {
.num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes), .num_channel_mode = ARRAY_SIZE(alc883_3ST_6ch_modes),
.channel_mode = alc883_3ST_6ch_modes, .channel_mode = alc883_3ST_6ch_modes,
.need_dac_fix = 1, .need_dac_fix = 1,
.const_channel_count = 6,
.num_mux_defs = .num_mux_defs =
ARRAY_SIZE(alc888_2_capture_sources), ARRAY_SIZE(alc888_2_capture_sources),
.input_mux = alc888_2_capture_sources, .input_mux = alc888_2_capture_sources,
@ -10423,7 +10424,7 @@ static void alc262_hp_t5735_setup(struct hda_codec *codec)
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
spec->autocfg.hp_pins[0] = 0x15; spec->autocfg.hp_pins[0] = 0x15;
spec->autocfg.speaker_pins[0] = 0x0c; /* HACK: not actually a pin */ spec->autocfg.speaker_pins[0] = 0x14;
} }
static struct snd_kcontrol_new alc262_hp_t5735_mixer[] = { static struct snd_kcontrol_new alc262_hp_t5735_mixer[] = {
@ -11852,9 +11853,9 @@ static struct alc_config_preset alc262_presets[] = {
.num_channel_mode = ARRAY_SIZE(alc262_modes), .num_channel_mode = ARRAY_SIZE(alc262_modes),
.channel_mode = alc262_modes, .channel_mode = alc262_modes,
.input_mux = &alc262_capture_source, .input_mux = &alc262_capture_source,
.unsol_event = alc_automute_amp_unsol_event, .unsol_event = alc_sku_unsol_event,
.setup = alc262_hp_t5735_setup, .setup = alc262_hp_t5735_setup,
.init_hook = alc_automute_amp, .init_hook = alc_inithook,
}, },
[ALC262_HP_RP5700] = { [ALC262_HP_RP5700] = {
.mixers = { alc262_hp_rp5700_mixer }, .mixers = { alc262_hp_rp5700_mixer },