[kernel] r15407 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Maximilian Attems]

Author: maks
Date: Tue Mar 16 22:16:11 2010
New Revision: 15407

Log:
no autoload of nouveau yet

Reported-by: Julien Cristau <jcristau at debian.org>

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/drivers-gpu-nouveau-no-udev-auto-loading.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/10

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Tue Mar 16 22:02:27 2010	(r15406)
+++ dists/sid/linux-2.6/debian/changelog	Tue Mar 16 22:16:11 2010	(r15407)
@@ -12,6 +12,7 @@
   * Bump ABI to 4.
   * [x86] Add openvz flavour.
     - adds ppp support (closes: #550975)
+  * Prevent nouveau from autoloading until xserver-xorg-video-nouveau lands.
  
   [ Moritz Muehlenhoff ]
   * Enable CONFIG_KEYS_DEBUG_PROC_KEYS (Closes: #400932)

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/drivers-gpu-nouveau-no-udev-auto-loading.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/drivers-gpu-nouveau-no-udev-auto-loading.patch	Tue Mar 16 22:16:11 2010	(r15407)
@@ -0,0 +1,34 @@
+From df56b20377639fc0ca70d0de7a94f30465af9e7f Mon Sep 17 00:00:00 2001
+From: maximilian attems <max at stro.at>
+Date: Tue, 16 Mar 2010 23:09:10 +0100
+Subject: [PATCH] prevent nouveau from udev auto loading
+
+we need working xserver-xorg-video-nouveau to ship it,
+also maybe newer nouveau.
+---
+ drivers/gpu/drm/nouveau/nouveau_drv.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
+index da3b93b..2d85e31 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
++++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
+@@ -104,6 +104,7 @@ module_param_named(fbpercrtc, nouveau_fbpercrtc, int, 0400);
+ #endif
+ 
+ static struct pci_device_id pciidlist[] = {
++/* no autoload until xserver-xorg-video-nouveau
+ 	{
+ 		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID),
+ 		.class = PCI_BASE_CLASS_DISPLAY << 16,
+@@ -115,6 +116,7 @@ static struct pci_device_id pciidlist[] = {
+ 		.class_mask  = 0xff << 16,
+ 	},
+ 	{}
++*/
+ };
+ 
+ MODULE_DEVICE_TABLE(pci, pciidlist);
+-- 
+1.5.6.5
+

Modified: dists/sid/linux-2.6/debian/patches/series/10
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/10	Tue Mar 16 22:02:27 2010	(r15406)
+++ dists/sid/linux-2.6/debian/patches/series/10	Tue Mar 16 22:16:11 2010	(r15407)
@@ -49,3 +49,4 @@
 - debian/drivers-ata-pata_sis-postpone-pata.patch
 - debian/drivers-ata-ata_piix-postpone-pata.patch
 + debian/piix-disable-redundant-devids.patch
++ bugfix/all/drivers-gpu-nouveau-no-udev-auto-loading.patch