From f093f316ff32eb575a29a0c723cfc74cf3b0982c Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 22 Oct 2012 10:56:07 +1000 Subject: [PATCH] --- yaml --- r: 334719 b: refs/heads/master c: 4bf24c02150a4c5e31d397342b1157496f1881ee h: refs/heads/master i: 334717: 3d728b8d17a7d2aa9ae2a28270940725e13218ed 334715: b88be94853fae709c2b04b22451c8b96f73af7df 334711: c1c001c0997bda9a198e8f9aed05a23bd1cdab2c 334703: 95f7cdb8e3dcae826dc0dcd05c00f5742923a082 334687: 987ad3f0c0c5b4002ff1966c56c4a04d611171f4 334655: a83bdecfaae1ff40eabceb255ad7d36844d96758 334591: 83ecf23a3ab3748b8cfb74f996a7e83c0bac5e07 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/core/subdev/vm/nv41.c | 3 ++- trunk/drivers/gpu/drm/nouveau/core/subdev/vm/nv44.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7a2f6ab32b48..94a3eabde6e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1626a965141b1e600efad29947b6c36dab183c3 +refs/heads/master: 4bf24c02150a4c5e31d397342b1157496f1881ee diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/vm/nv41.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/vm/nv41.c index 0203e1e12caa..49050d991e75 100644 --- a/trunk/drivers/gpu/drm/nouveau/core/subdev/vm/nv41.c +++ b/trunk/drivers/gpu/drm/nouveau/core/subdev/vm/nv41.c @@ -92,7 +92,8 @@ nv41_vmmgr_ctor(struct nouveau_object *parent, struct nouveau_object *engine, struct nv04_vmmgr_priv *priv; 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, data, size, pobject); } diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/vm/nv44.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/vm/nv44.c index 0ac18d05a146..aa8131436e3d 100644 --- a/trunk/drivers/gpu/drm/nouveau/core/subdev/vm/nv44.c +++ b/trunk/drivers/gpu/drm/nouveau/core/subdev/vm/nv44.c @@ -163,7 +163,8 @@ nv44_vmmgr_ctor(struct nouveau_object *parent, struct nouveau_object *engine, struct nv04_vmmgr_priv *priv; 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, data, size, pobject); }