use nouveau as default free driver for NVIDIA cards, except for

Riva 128 (NV03) which is not supported bt it

3 files changed, 19 insertions, 40 deletions

diff --git a/NEWS b/NEWS
index 61f50b94..d7101649 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@
 - add new ATI ids from fglrx 8.671, 8.681 assigned to
   fglrx+radeonhd
 - switch all HD 5000 series ATI ids from ati to radeonhd
+- use nouveau as default free driver for NVIDIA cards, except for
+  Riva 128 (NV03) which is not supported by it
 
 Version 0.1.279 - 27 October 2009
 
diff --git a/lst/Cards+ b/lst/Cards+
index e8150362..9b97521e 100644
--- a/lst/Cards+
+++ b/lst/Cards+
@@ -262,19 +262,19 @@ DRIVER nv
 BAD_FB_RESTORE
 
 NAME NVIDIA RIVA TNT to GeForce 2
-DRIVER nv
+DRIVER nouveau
 #DRIVER2 nvidia71xx (not compatible with x.org server 1.6)
 
 NAME NVIDIA GeForce 2 MX to GeForce 4
-DRIVER nv
+DRIVER nouveau
 DRIVER2 nvidia96xx
 
 NAME NVIDIA GeForce FX series
-DRIVER nv
+DRIVER nouveau
 DRIVER2 nvidia173
 
 NAME NVIDIA GeForce 6100 and later
-DRIVER nv
+DRIVER nouveau
 DRIVER2 nvidia-current
 DRIVER2_NO_SSE nvidia96xx
 
@@ -283,31 +283,8 @@ DRIVER nvxbox
 LINE Option "UseFBDev" "1"
 LINE Option "HWCursor" "0"
 
-NAME NVIDIA GeForce (nouveau driver, experimental)
-DRIVER nouveau
-
-# This entry blacklists IDs that are known from MDV and / or
-# freedesktop.org reports to not work with the 'nv' driver. Reports:
-
-# https://qa.mandriva.com/show_bug.cgi?id=38391 - 053A
-# http://bugs.freedesktop.org/show_bug.cgi?id=13629 - 053B
-# http://bugs.freedesktop.org/show_bug.cgi?id=15251 - 0533
-# http://bugs.freedesktop.org/show_bug.cgi?id=16565 - 0531
-# http://bugs.freedesktop.org/show_bug.cgi?id=17526 - 0849
-# http://bugs.freedesktop.org/show_bug.cgi?id=18092 - 0848
-# http://bugs.freedesktop.org/show_bug.cgi?id=19545 - 0863, 086a
-# http://bugs.freedesktop.org/show_bug.cgi?id=19617 - 0641
-#
-# Note that 086a is not listed even in nvidia-current, even while it works with
-# it.
-
 NAME NVIDIA cards not working with nvidia
-DRIVER nv
-
-NAME NVIDIA cards not working with nv
-DRIVER vesa
-DRIVER2 nvidia-current
-DRIVER2_NO_SSE nvidia96xx
+DRIVER nouveau
 
 # IMS
 
diff --git a/lst/pcitable b/lst/pcitable
index f66f63ed..21ebd371 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -1326,12 +1326,12 @@
 0x10de	0x042e	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x042f	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x0530	"Card:NVIDIA GeForce 6100 and later"
-0x10de	0x0531	"Card:NVIDIA cards not working with nv"
+0x10de	0x0531	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x0532	"Card:NVIDIA GeForce 6100 and later"
-0x10de	0x0533	"Card:NVIDIA cards not working with nv"
-0x10de	0x053a	"Card:NVIDIA cards not working with nv"
-0x10de	0x053b	"Card:NVIDIA cards not working with nv"
-0x10de	0x053e	"Card:NVIDIA cards not working with nv"
+0x10de	0x0533	"Card:NVIDIA GeForce 6100 and later"
+0x10de	0x053a	"Card:NVIDIA GeForce 6100 and later"
+0x10de	0x053b	"Card:NVIDIA GeForce 6100 and later"
+0x10de	0x053e	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x053f	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x055c	"snd_hda_intel"
 0x10de	0x055d	"snd_hda_intel"
@@ -1398,7 +1398,7 @@
 0x10de	0x0638	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x063a	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x0640	"Card:NVIDIA GeForce 6100 and later"
-0x10de	0x0641	"Card:NVIDIA cards not working with nv"
+0x10de	0x0641	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x0643	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x0644	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x0645	"Card:NVIDIA GeForce 6100 and later"
@@ -1416,8 +1416,8 @@
 0x10de	0x0654	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x0655	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x0656	"Card:NVIDIA GeForce 6100 and later"
-0x10de	0x0658	"Card:NVIDIA cards not working with nv"
-0x10de	0x0659	"Card:NVIDIA cards not working with nv"
+0x10de	0x0658	"Card:NVIDIA GeForce 6100 and later"
+0x10de	0x0659	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x065a	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x065b	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x065c	"Card:NVIDIA GeForce 6100 and later"
@@ -1452,8 +1452,8 @@
 0x10de	0x0845	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x0846	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x0847	"Card:NVIDIA GeForce 6100 and later"
-0x10de	0x0848	"Card:NVIDIA cards not working with nv"
-0x10de	0x0849	"Card:NVIDIA cards not working with nv"
+0x10de	0x0848	"Card:NVIDIA GeForce 6100 and later"
+0x10de	0x0849	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x084a	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x084b	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x084c	"Card:NVIDIA GeForce 6100 and later"
@@ -1462,13 +1462,13 @@
 0x10de	0x0860	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x0861	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x0862	"Card:NVIDIA GeForce 6100 and later"
-0x10de	0x0863	"Card:NVIDIA cards not working with nv"
+0x10de	0x0863	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x0864	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x0865	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x0866	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x0867	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x0868	"Card:NVIDIA GeForce 6100 and later"
-0x10de	0x086a	"Card:NVIDIA cards not working with nv"
+0x10de	0x086a	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x086c	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x086d	"Card:NVIDIA GeForce 6100 and later"
 0x10de	0x086e	"Card:NVIDIA GeForce 6100 and later"