---

yaml --- r: 307526 b: refs/heads/master c: d0f3c7e h: refs/heads/master v: v3
git-mirror · May 24, 2012 · 8c0aa38 · 8c0aa38
1 parent 484d2cb
commit 8c0aa38
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78c20186581c7558429b591fb2942be44b47d59f
+refs/heads/master: d0f3c7e41d30859a638083654002b9b6faf7f67b
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c
@@ -341,10 +341,10 @@ nouveau_sgdma_init(struct drm_device *dev)
 	u32 aper_size, align;
 	int ret;
 
-	if (dev_priv->card_type >= NV_40 && pci_is_pcie(dev->pdev))
+	if (dev_priv->card_type >= NV_40)
 		aper_size = 512 * 1024 * 1024;
 	else
-		aper_size = 64 * 1024 * 1024;
+		aper_size = 128 * 1024 * 1024;
 
 	/* Dear NVIDIA, NV44+ would like proper present bits in PTEs for
 	 * christmas.  The cards before it have them, the cards after

diff --git a/trunk/drivers/gpu/drm/nouveau/nv04_instmem.c b/trunk/drivers/gpu/drm/nouveau/nv04_instmem.c
@@ -41,12 +41,8 @@ int nv04_instmem_init(struct drm_device *dev)
 		rsvd += 16 * 1024;
 		rsvd *= dev_priv->engine.fifo.channels;
 
-		/* pciegart table */
-		if (pci_is_pcie(dev->pdev))
-			rsvd += 512 * 1024;
-
-		/* object storage */
-		rsvd += 512 * 1024;
+		rsvd += 512 * 1024; /* pci(e)gart table */
+		rsvd += 512 * 1024; /* object storage */
 
 		dev_priv->ramin_rsvd_vram = round_up(rsvd, 4096);
 	} else {