linux: update nouveau drm patches

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2010-11-05 02:42:52 +01:00
parent 6eec796737
commit fd1342e03f
3 changed files with 189 additions and 178 deletions

View File

@ -1,16 +0,0 @@
diff -Naur linux-2.6.36.orig/drivers/gpu/drm/nouveau/nouveau_sgdma.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_sgdma.c
--- linux-2.6.36.orig/drivers/gpu/drm/nouveau/nouveau_sgdma.c 2010-10-23 16:00:10.512365461 +0200
+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_sgdma.c 2010-10-23 15:57:19.079304241 +0200
@@ -224,11 +224,7 @@
int i, ret;
if (dev_priv->card_type < NV_50) {
- if(dev_priv->card_type < NV_40) {
- aper_size = (64 * 1024 * 1024);
- } else {
- aper_size = (512 * 1024 * 1024);
- }
+ aper_size = (64 * 1024 * 1024);
obj_size = (aper_size >> NV_CTXDMA_PAGE_SHIFT) * 4;
obj_size += 8; /* ctxdma header */
} else {

View File

@ -1,11 +0,0 @@
diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/Kconfig linux-2.6.36.patch/drivers/gpu/drm/nouveau/Kconfig
--- linux-2.6.36/drivers/gpu/drm/nouveau/Kconfig 2010-10-24 04:19:00.872718004 +0200
+++ linux-2.6.36.patch/drivers/gpu/drm/nouveau/Kconfig 2010-10-24 04:19:42.287230715 +0200
@@ -10,7 +10,6 @@
select FB
select FRAMEBUFFER_CONSOLE if !EMBEDDED
select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT
- select ACPI_VIDEO if ACPI
help
Choose this option for open-source nVidia support.