summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2013-10-09 06:09:25 (GMT)
committerDave Airlie <airlied@redhat.com>2013-10-09 06:09:25 (GMT)
commit1d083bc93d159ebcb46c5cbeca512ddd74a74e4b (patch)
tree7686eb472ca297e6375a744e3e07cc84b1f4343c
parentb9aa8510dd68143cc9d66c520002b638983e254b (diff)
parentb46b28d339164c8c74020eace97163e2e478ef34 (diff)
downloadlinux-1d083bc93d159ebcb46c5cbeca512ddd74a74e4b.tar.xz
Merge remote-tracking branch 'nouveau/drm-nouveau-next' into drm-fixes
Disable MSIs for now until we can fix them up * nouveau/drm-nouveau-next: drm/nouveau/mc: disable msi support by default, it's busted in tons of places
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/mc/base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/mc/base.c b/drivers/gpu/drm/nouveau/core/subdev/mc/base.c
index 37712a6..e290cfa 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/mc/base.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/mc/base.c
@@ -113,7 +113,7 @@ nouveau_mc_create_(struct nouveau_object *parent, struct nouveau_object *engine,
pmc->use_msi = false;
break;
default:
- pmc->use_msi = nouveau_boolopt(device->cfgopt, "NvMSI", true);
+ pmc->use_msi = nouveau_boolopt(device->cfgopt, "NvMSI", false);
if (pmc->use_msi) {
pmc->use_msi = pci_enable_msi(device->pdev) == 0;
if (pmc->use_msi) {