lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/nouveau: fix nv30 pcie boards

Browse Source 
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: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs
2011-04-08 10:07:34 +10:00
parent 04eb34a43c
commit 01d153326e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/nouveau_mem.c
View File

@@ -398,7 +398,7 @@ nouveau_mem_vram_init(struct drm_device *dev)
dma_bits = 40; dma_bits = 40;
} else } else
if (drm_pci_device_is_pcie(dev) && if (drm_pci_device_is_pcie(dev) &&
dev_priv->chipset != 0x40 && dev_priv->chipset > 0x40 &&
dev_priv->chipset != 0x45) { dev_priv->chipset != 0x45) {
if (pci_dma_supported(dev->pdev, DMA_BIT_MASK(39))) if (pci_dma_supported(dev->pdev, DMA_BIT_MASK(39)))
dma_bits = 39; dma_bits = 39;

4
drivers/gpu/drm/nouveau/nouveau_sgdma.c
View File

@@ -427,7 +427,7 @@ nouveau_sgdma_init(struct drm_device *dev)
u32 aper_size, align; u32 aper_size, align;
int ret; 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; aper_size = 512 * 1024 * 1024;
else else
aper_size = 64 * 1024 * 1024; aper_size = 64 * 1024 * 1024;
@@ -457,7 +457,7 @@ nouveau_sgdma_init(struct drm_device *dev)
dev_priv->gart_info.func = &nv50_sgdma_backend; dev_priv->gart_info.func = &nv50_sgdma_backend;
} else } else
if (drm_pci_device_is_pcie(dev) && 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)) { if (nv44_graph_class(dev)) {
dev_priv->gart_info.func = &nv44_sgdma_backend; dev_priv->gart_info.func = &nv44_sgdma_backend;
align = 512 * 1024; align = 512 * 1024;