summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-03-15 15:51:53 +0100
committerTakashi Iwai <tiwai@suse.de>2010-03-15 15:51:53 +0100
commit80c43ed724797627d8f86855248c497a6161a214 (patch)
tree7d97d441773340bf582b247dacfa93e9d797e6a8 /sound
parentb43f6e5e258d67acae5961896d10bbe38c271070 (diff)
downloadlinux-80c43ed724797627d8f86855248c497a6161a214.tar.gz
linux-80c43ed724797627d8f86855248c497a6161a214.tar.bz2
linux-80c43ed724797627d8f86855248c497a6161a214.zip
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)
"hda_intel: msi for device %04x:%04x set to %d\n",
q->subvendor, q->subdevice, q->value);
chip->msi = q->value;
+ return;
+ }
+
+ /* NVidia chipsets seem to cause troubles with MSI */
+ if (chip->driver_type == AZX_DRIVER_NVIDIA) {
+ printk(KERN_INFO "hda_intel: Disable MSI for Nvidia chipset\n");
+ chip->msi = 0;
}
}