Commit 4bf24c02 authored by Ben Skeggs's avatar Ben Skeggs

drm/nv41/vm: don't init hw pciegart on boards with agp bridge

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent d1626a96
...@@ -92,7 +92,8 @@ nv41_vmmgr_ctor(struct nouveau_object *parent, struct nouveau_object *engine, ...@@ -92,7 +92,8 @@ nv41_vmmgr_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nv04_vmmgr_priv *priv; struct nv04_vmmgr_priv *priv;
int ret; int ret;
if (!nouveau_boolopt(device->cfgopt, "NvPCIE", true)) { if (pci_find_capability(device->pdev, PCI_CAP_ID_AGP) ||
!nouveau_boolopt(device->cfgopt, "NvPCIE", true)) {
return nouveau_object_ctor(parent, engine, &nv04_vmmgr_oclass, return nouveau_object_ctor(parent, engine, &nv04_vmmgr_oclass,
data, size, pobject); data, size, pobject);
} }
......
...@@ -163,7 +163,8 @@ nv44_vmmgr_ctor(struct nouveau_object *parent, struct nouveau_object *engine, ...@@ -163,7 +163,8 @@ nv44_vmmgr_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nv04_vmmgr_priv *priv; struct nv04_vmmgr_priv *priv;
int ret; int ret;
if (!nouveau_boolopt(device->cfgopt, "NvPCIE", true)) { if (pci_find_capability(device->pdev, PCI_CAP_ID_AGP) ||
!nouveau_boolopt(device->cfgopt, "NvPCIE", true)) {
return nouveau_object_ctor(parent, engine, &nv04_vmmgr_oclass, return nouveau_object_ctor(parent, engine, &nv04_vmmgr_oclass,
data, size, pobject); data, size, pobject);
} }
......
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