Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01d15332 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: fix nv30 pcie boards 



Wasn't aware they even existed, apparently they do!  They're actually
AGP chips with a bridge as far as I can tell, which puts them in the
same boat as nv40/nv45.

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

drivers/gpu/drm/nouveau/nouveau_mem.c

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ nouveau_mem_vram_init(struct drm_device *dev) 
			dma_bits = 40;

	} else

	if (drm_pci_device_is_pcie(dev) &&

	    dev_priv->chipset != 0x40 &&

	    dev_priv->chipset  > 0x40 &&

	    dev_priv->chipset != 0x45) {

		if (pci_dma_supported(dev->pdev, DMA_BIT_MASK(39)))

			dma_bits = 39;

drivers/gpu/drm/nouveau/nouveau_sgdma.c

+2 −2
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ nouveau_sgdma_init(struct drm_device *dev) 
	u32 aper_size, align;

	int ret;



	if (dev_priv->card_type >= NV_50 || drm_pci_device_is_pcie(dev))

	if (dev_priv->card_type >= NV_40 && drm_pci_device_is_pcie(dev))

		aper_size = 512 * 1024 * 1024;

	else

		aper_size = 64 * 1024 * 1024;
@@ -457,7 +457,7 @@ nouveau_sgdma_init(struct drm_device *dev) 
		dev_priv->gart_info.func = &nv50_sgdma_backend;

	} else

	if (drm_pci_device_is_pcie(dev) &&

	    dev_priv->chipset != 0x40 && dev_priv->chipset != 0x45) {

	    dev_priv->chipset > 0x40 && dev_priv->chipset != 0x45) {

		if (nv44_graph_class(dev)) {

			dev_priv->gart_info.func = &nv44_sgdma_backend;

			align = 512 * 1024;