Commit d0f3c7e4 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: give a slightly larger pci(e)gart aperture on all chipsets 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 78c20186

drivers/gpu/drm/nouveau/nouveau_sgdma.c

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/nouveau/nv04_instmem.c

+2 −6
Original line number Diff line number Diff line
@@ -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 {