diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-10-09 08:09:25 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-10-09 08:09:25 +0200 |
| commit | 1d083bc93d159ebcb46c5cbeca512ddd74a74e4b (patch) | |
| tree | 7686eb472ca297e6375a744e3e07cc84b1f4343c /drivers | |
| parent | drm/gma500: fix things after get/put page helpers (diff) | |
| parent | drm/nouveau/mc: disable msi support by default, it's busted in tons of places (diff) | |
| download | linux-1d083bc93d159ebcb46c5cbeca512ddd74a74e4b.tar.xz linux-1d083bc93d159ebcb46c5cbeca512ddd74a74e4b.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/mc/base.c | 2 |
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 37712a6df923..e290cfa4acee 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) { |