aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-03-15 10:51:53 -0400
committerTakashi Iwai <tiwai@suse.de>2010-03-15 10:51:53 -0400
commit80c43ed724797627d8f86855248c497a6161a214 (patch)
tree7d97d441773340bf582b247dacfa93e9d797e6a8 /sound
parentb43f6e5e258d67acae5961896d10bbe38c271070 (diff)
ALSA: hda - Disable MSI for Nvidia controller
Judging from the member of enable_msi white-list, Nvidia controller seems to cause troubles with MSI enabled, e.g. boot hang up or other serious issue may come up. It's safer to disable MSI as default for Nvidia controllers again for now. Signed-off-by: Takashi Iwai <tiwai@suse.de> Cc: <stable@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_intel.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 926815201885..027d3f4c1c59 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2378,6 +2378,13 @@ static void __devinit check_msi(struct azx *chip)
2378 "hda_intel: msi for device %04x:%04x set to %d\n", 2378 "hda_intel: msi for device %04x:%04x set to %d\n",
2379 q->subvendor, q->subdevice, q->value); 2379 q->subvendor, q->subdevice, q->value);
2380 chip->msi = q->value; 2380 chip->msi = q->value;
2381 return;
2382 }
2383
2384 /* NVidia chipsets seem to cause troubles with MSI */
2385 if (chip->driver_type == AZX_DRIVER_NVIDIA) {
2386 printk(KERN_INFO "hda_intel: Disable MSI for Nvidia chipset\n");
2387 chip->msi = 0;
2381 } 2388 }
2382} 2389}
2383 2390