Commit 1d083bc9 authored by Dave Airlie's avatar Dave Airlie

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
parents b9aa8510 b46b28d3
...@@ -113,7 +113,7 @@ nouveau_mc_create_(struct nouveau_object *parent, struct nouveau_object *engine, ...@@ -113,7 +113,7 @@ nouveau_mc_create_(struct nouveau_object *parent, struct nouveau_object *engine,
pmc->use_msi = false; pmc->use_msi = false;
break; break;
default: default:
pmc->use_msi = nouveau_boolopt(device->cfgopt, "NvMSI", true); pmc->use_msi = nouveau_boolopt(device->cfgopt, "NvMSI", false);
if (pmc->use_msi) { if (pmc->use_msi) {
pmc->use_msi = pci_enable_msi(device->pdev) == 0; pmc->use_msi = pci_enable_msi(device->pdev) == 0;
if (pmc->use_msi) { if (pmc->use_msi) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment