From 91fab41dfb885a3fb0f56d5caa7e0594fc0d3c2e Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 7 Apr 2011 12:43:44 +1000 Subject: [PATCH] nouveau: switch nv4x to use only lowmem --- drm-nouveau-updates.patch | 4 ++-- kernel.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drm-nouveau-updates.patch b/drm-nouveau-updates.patch index 9c032f4df..c426b80d5 100644 --- a/drm-nouveau-updates.patch +++ b/drm-nouveau-updates.patch @@ -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))) diff --git a/kernel.spec b/kernel.spec index c78f37a94..86409b6d2 100644 --- a/kernel.spec +++ b/kernel.spec @@ -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 2.6.38-2.12 +- nouveau: switch nv4x back to DMA32 only (rhbz#689825) + * Mon Apr 04 2011 Ben Skeggs 2.6.38-2.11 - ttm: add patch from upstream to fix a recent nouveau issue