diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-10-09 02:09:25 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-10-09 02:09:25 -0400 |
| commit | 1d083bc93d159ebcb46c5cbeca512ddd74a74e4b (patch) | |
| tree | 7686eb472ca297e6375a744e3e07cc84b1f4343c /drivers/gpu | |
| parent | b9aa8510dd68143cc9d66c520002b638983e254b (diff) | |
| parent | b46b28d339164c8c74020eace97163e2e478ef34 (diff) | |
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/gpu')
| -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, | |||
| 113 | pmc->use_msi = false; | 113 | pmc->use_msi = false; |
| 114 | break; | 114 | break; |
| 115 | default: | 115 | default: |
| 116 | pmc->use_msi = nouveau_boolopt(device->cfgopt, "NvMSI", true); | 116 | pmc->use_msi = nouveau_boolopt(device->cfgopt, "NvMSI", false); |
| 117 | if (pmc->use_msi) { | 117 | if (pmc->use_msi) { |
| 118 | pmc->use_msi = pci_enable_msi(device->pdev) == 0; | 118 | pmc->use_msi = pci_enable_msi(device->pdev) == 0; |
| 119 | if (pmc->use_msi) { | 119 | if (pmc->use_msi) { |