debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

* drm/nouveau, drm/radeon: remove fix for non-powerpc/sparc/x86. 

* [mips,mipsel] Disabled CONFIG_DRM_NOUVEAU and CONFIG_DRM_RADEON_KMS.


svn path=/dists/trunk/linux-2.6/; revision=17302
This commit is contained in:
Aurelien Jarno 2011-05-05 14:53:48 +00:00
parent 97c24c810b
commit 4a09e34d41
6 changed files with 24 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -11,6 +11,10 @@ linux-2.6 (2.6.39~rc6-1~experimental.1) UNRELEASED; urgency=low
* [x86] Enable BRCMSMAC; the brcmsmac module replaces brcm80211
(Closes: #625510)
[ Aurelien Jarno ]
* drm/nouveau, drm/radeon: remove fix for non-powerpc/sparc/x86.
* [mips,mipsel] Disabled CONFIG_DRM_NOUVEAU and CONFIG_DRM_RADEON_KMS.
-- maximilian attems <maks@debian.org> Tue, 01 May 2011 14:36:33 +0100
linux-2.6 (2.6.39~rc5-1~experimental.1) experimental; urgency=low

10
debian/config/mips/config vendored
View File

@ -7,6 +7,16 @@ CONFIG_CPU_BIG_ENDIAN=y
## end choice
CONFIG_SECCOMP=y
##
## file: drivers/gpu/drm/nouveau/Kconfig
##
# CONFIG_DRM_NOUVEAU is not set
##
## file: drivers/gpu/drm/radeon/Kconfig
##
# CONFIG_DRM_RADEON_KMS is not set
##
## file: drivers/net/Kconfig
##

10
debian/config/mipsel/config vendored
View File

@ -7,6 +7,16 @@ CONFIG_CPU_LITTLE_ENDIAN=y
## end choice
CONFIG_SECCOMP=y
##
## file: drivers/gpu/drm/nouveau/Kconfig
##
# CONFIG_DRM_NOUVEAU is not set
##
## file: drivers/gpu/drm/radeon/Kconfig
##
# CONFIG_DRM_RADEON_KMS is not set
##
## file: drivers/net/Kconfig
##

30
debian/patches/bugfix/all/drm-nouveau-Use-pci_dma_mapping_error.patch vendored
View File

@ -1,30 +0,0 @@
From 2fbfe63a8f454c505d730636de3366a0e5ab0601 Mon Sep 17 00:00:00 2001
From: Aurelien Jarno <aurelien@aurel32.net>
Date: Tue, 26 Apr 2011 23:00:20 +0200
Subject: [PATCH 2/2] drm/nouveau: Use pci_dma_mapping_error()
... instead of comparing with DMA_ERROR_CODE, which will only work on
powerpc/sparc/x86.
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---
drivers/gpu/drm/nouveau/nouveau_sgdma.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
index 4bce801..b038de9 100644
--- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
@@ -42,7 +42,8 @@ nouveau_sgdma_populate(struct ttm_backend *be, unsigned long num_pages,
nvbe->nr_pages = 0;
while (num_pages--) {
- if (dma_addrs[nvbe->nr_pages] != DMA_ERROR_CODE) {
+ if (!pci_dma_mapping_error(dev->pdev,
+ dma_addrs[nvbe->nr_pages])) {
nvbe->pages[nvbe->nr_pages] =
dma_addrs[nvbe->nr_pages];
nvbe->ttm_alloced[nvbe->nr_pages] = true;
--
1.7.2.3

29
debian/patches/bugfix/all/drm-radeon-Use-pci_dma_mapping_error.patch vendored
View File

@ -1,29 +0,0 @@
From 1ab87fee280218acb5cca6ddbe81bd2367d8559f Mon Sep 17 00:00:00 2001
From: Aurelien Jarno <aurelien@aurel32.net>
Date: Tue, 26 Apr 2011 21:14:40 +0200
Subject: [PATCH 1/2] drm/radeon: Use pci_dma_mapping_error()
... instead of comparing with DMA_ERROR_CODE, which will only work on
powerpc/sparc/x86.
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---
drivers/gpu/drm/radeon/radeon_gart.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c
index 8a955bb..d96f5ea 100644
--- a/drivers/gpu/drm/radeon/radeon_gart.c
+++ b/drivers/gpu/drm/radeon/radeon_gart.c
@@ -183,7 +183,7 @@ int radeon_gart_bind(struct radeon_device *rdev, unsigned offset,
for (i = 0; i < pages; i++, p++) {
/* On TTM path, we only use the DMA API if TTM_PAGE_FLAG_DMA32
* is requested. */
- if (dma_addr[i] != DMA_ERROR_CODE) {
+ if (!pci_dma_mapping_error(rdev->pdev, dma_addr[i])) {
rdev->gart.ttm_alloced[p] = true;
rdev->gart.pages_addr[p] = dma_addr[i];
} else {
--
1.7.2.3

2
debian/patches/series/base vendored
View File

@ -42,7 +42,5 @@
+ features/all/perf-Define-make-variables-ARCH-and-SRCARCH-consiste.patch
+ debian/sched-autogroup-disabled.patch
+ bugfix/all/rt2800-disable-powersaving-as-default.patch
+ bugfix/all/drm-nouveau-Use-pci_dma_mapping_error.patch
+ bugfix/all/drm-radeon-Use-pci_dma_mapping_error.patch
+ bugfix/powerpc/powerpc-kexec-Fix-build-failure-on-32-bit-SMP.patch
+ bugfix/all/xhci-hcd-Include-linux-slab.h-in-xhci-pci.c.patch