nouveau: switch nv4x to use only lowmem

This commit is contained in:
Ben Skeggs 2011-04-07 12:43:44 +10:00
parent f3e795d08b
commit 91fab41dfb
2 changed files with 6 additions and 3 deletions

View File

@ -1680,7 +1680,7 @@ index 4a8ad13..86c2e37 100644
static inline void
cp_pos(struct nouveau_grctx *ctx, int offset)
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
index b0fb9bd..9a91bf1 100644
index b0fb9bd..07ee9af 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
@@ -152,7 +152,6 @@ nouveau_mem_vram_fini(struct drm_device *dev)
@ -1705,7 +1705,7 @@ index b0fb9bd..9a91bf1 100644
+ if (pci_dma_supported(dev->pdev, DMA_BIT_MASK(40)))
+ dma_bits = 40;
+ } else
+ if (drm_device_is_pcie(dev) &&
+ if (0 && drm_device_is_pcie(dev) &&
+ dev_priv->chipset != 0x40 &&
+ dev_priv->chipset != 0x45) {
+ if (pci_dma_supported(dev->pdev, DMA_BIT_MASK(39)))

View File

@ -51,7 +51,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be prepended with "0.", so
# for example a 3 here will become 0.3
#
%global baserelease 11
%global baserelease 12
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@ -1974,6 +1974,9 @@ fi
# and build.
%changelog
* Thu Apr 07 2011 Ben Skeggs <bskeggs@redhat.com> 2.6.38-2.12
- nouveau: switch nv4x back to DMA32 only (rhbz#689825)
* Mon Apr 04 2011 Ben Skeggs <bskeggs@redhat.com> 2.6.38-2.11
- ttm: add patch from upstream to fix a recent nouveau issue