xf86-video-nv: 4 commits - compat/.gitignore compat/Makefile.am compat/README configure.ac Makefile.am src/local_xf86Rename.h src/Makefile.am src/nv_driver.c

Aaron Plattner aplattner at kemper.freedesktop.org
Mon Jul 19 12:11:18 PDT 2010


 Makefile.am            |    2 -
 compat/.gitignore      |    2 -
 compat/Makefile.am     |   16 ---------
 compat/README          |    7 ----
 configure.ac           |   47 ---------------------------
 src/Makefile.am        |   23 -------------
 src/local_xf86Rename.h |   23 -------------
 src/nv_driver.c        |   84 +++++++++++++++++++++++++++++++++++++++++++++----
 8 files changed, 81 insertions(+), 123 deletions(-)

New commits:
commit fd341048bac3d7181bcb37b51e59118babf9885c
Merge: 6d2431a... a2dc32c...
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Mon Jul 19 11:34:39 2010 -0700

    Merge branch 'master' of git://soprano/~aaron/xf86-video-nv

commit 6d2431a37ffd7a976e9046424a6c1f3c47ded2df
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Sat Jul 17 10:52:50 2010 -0700

    The /compat code is no longer required.
    
    This was used at one point in time to backport the modes code from server
    1.3 to server 1.2. When the tarball was created, whatever modes code
    was on the developer disk was included.
    
    The server 1.2 as shipped in the tarball on the web does not contain the
    modes code. It was added just after and found in git branch server-1.2-branch.
    
    The modes code was initially included in version 2.0.95 and still compiles
    with server 1.2. As of version 2.1.9 it no longer compiles.
    Subsequent versions are not backward compatible and probably not meant to be.
    
    The XRandR wiki points to articles saying that XRandR 1.2 first appeared in
    server 1.3 and nv 2.0.95. Given that modes code in current server version
    does not compile with server 1.2, and that the modes code is included in
    version 1.3 and up, might as well stop including this modes code in the driver.
    
    This patch makes the driver requiring server 1.3 or later.
    
    This will solve the issue where "make dist" fails "out of the box"
    and requires manual fix-up on the build machine which is documented
    in the compat/README file.
    
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>

diff --git a/Makefile.am b/Makefile.am
index 94c0b1d..d8f84e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-SUBDIRS = src man compat
+SUBDIRS = src man
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
 EXTRA_DIST = README.G80
diff --git a/compat/.gitignore b/compat/.gitignore
deleted file mode 100644
index 8d30df6..0000000
--- a/compat/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-modes
-parser
diff --git a/compat/Makefile.am b/compat/Makefile.am
deleted file mode 100644
index de17f93..0000000
--- a/compat/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-EXTRA_DIST = \
-    parser/xf86Parser.h \
-    parser/xf86Optrec.h \
-    modes/xf86Crtc.c \
-    modes/xf86Crtc.h \
-    modes/xf86Cursors.c \
-    modes/xf86cvt.c \
-    modes/xf86DiDGA.c \
-    modes/xf86EdidModes.c \
-    modes/xf86gtf.c \
-    modes/xf86Modes.c \
-    modes/xf86Modes.h \
-    modes/xf86RandR12.c \
-    modes/xf86RandR12.h \
-    modes/xf86Rename.h \
-    modes/xf86Rotate.c
diff --git a/compat/README b/compat/README
deleted file mode 100644
index 3e2b089..0000000
--- a/compat/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This directory contains a copy of the mode and parser code from RandR 1.2.
-
-If you are building from git and you don't have xorg-server-1.3 or higher or you
-want to be able to make dist, you should create symlinks to the modes and parser
-directories from a RandR 1.2-enabled server here:
-
-  $ ln -s /path/to/xorg/xserver/hw/xfree86/{modes,parser} .
diff --git a/configure.ac b/configure.ac
index 02f8ab3..d53c727 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,11 +55,6 @@ AC_ARG_WITH(xorg-module-dir,
             [moduledir="$withval"],
             [moduledir="$libdir/xorg/modules"])
 
-AC_ARG_WITH(xserver-source,AC_HELP_STRING([--with-xserver-source=XSERVER_SOURCE],
-                                          [Path to X server source tree]),
-                           [ XSERVER_SOURCE="$withval" ],
-                           [ XSERVER_SOURCE="" ])
-
 # Checks for extensions
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
 XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
@@ -67,7 +62,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3 xproto fontsproto $REQUIRED_MODULES])
 PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
                   HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
                   HAVE_XEXTPROTO_71="no")
@@ -81,9 +76,6 @@ AC_HEADER_STDC
 save_CFLAGS="$CFLAGS"
 CFLAGS="$XORG_CFLAGS"
 
-# RandR 1.2
-AC_CHECK_HEADER(xf86Modes.h,[BUILD_XMODES=no],[BUILD_XMODES=yes],[#include "xorg-server.h"])
-
 # PCI rework
 AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
               [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
@@ -94,42 +86,6 @@ fi
 
 CFLAGS="$save_CFLAGS"
 
-AM_CONDITIONAL(BUILD_XMODES, test "x$BUILD_XMODES" = xyes)
-if test "x$XSERVER_SOURCE" != x; then
-    if test -d "$XSERVER_SOURCE"; then
-        XSERVER_SOURCE=`cd "$XSERVER_SOURCE" && pwd`
-        if test -f "$XSERVER_SOURCE/hw/xfree86/modes/xf86Modes.h" -a -f "$XSERVER_SOURCE/hw/xfree86/parser/xf86Parser.h"; then
-            :
-        else
-            AC_ERROR([Server source at $XSERVER_SOURCE doesn't have the new mode code])
-        fi
-    else
-        AC_ERROR([Can't find xserver-source path $XSERVER_SOURCE])
-    fi
-fi
-if test "x$BUILD_XMODES" = xno; then
-    AC_MSG_NOTICE([X server has new mode code])
-    XMODES_CFLAGS=
-    parser_dir=
-    modes_dir=
-else
-    if test "x$XSERVER_SOURCE" = x; then
-            AC_MSG_NOTICE([X server is missing new mode code and --with-xserver-source not specified, using local copy])
-            AC_MSG_NOTICE([If you're building from git, please read compat/README])
-            parser_dir='$(top_srcdir)/compat/parser'
-            modes_dir='$(top_srcdir)/compat/modes'
-    else
-            AC_MSG_NOTICE([Using mode code from $XSERVER_SOURCE])
-            parser_dir="$XSERVER_SOURCE/hw/xfree86/parser"
-            modes_dir="$XSERVER_SOURCE/hw/xfree86/modes"
-    fi
-    XMODES_CFLAGS="-DXF86_MODES_RENAME -I\"$modes_dir\" -I\"$parser_dir\""
-    AC_DEFINE(BUILD_XMODES, 1,[X server doesn't have built-in mode code, so we need to build it])
-fi
-AC_SUBST([XMODES_CFLAGS])
-AC_SUBST([parser_dir])
-AC_SUBST([modes_dir])
-
 # Substitutions
 AC_SUBST([XORG_CFLAGS])
 AC_SUBST([moduledir])
@@ -141,5 +97,4 @@ AC_OUTPUT([
 	Makefile
 	src/Makefile
 	man/Makefile
-	compat/Makefile
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
index 2677d9c..70e127c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XMODES_CFLAGS@ @XORG_CFLAGS@
+AM_CFLAGS = @XORG_CFLAGS@
 nv_drv_la_LTLIBRARIES = nv_drv.la
 nv_drv_la_LDFLAGS = -module -avoid-version
 nv_drv_ladir = @moduledir@/drivers
@@ -82,24 +82,3 @@ g80_sources = \
          g80_xaa.c \
          g80_xaa.h
 
-xmode_sources = \
-         @parser_dir@/xf86Parser.h \
-         @parser_dir@/xf86Optrec.h \
-         @modes_dir@/xf86Modes.h \
-         @modes_dir@/xf86Modes.c \
-         @modes_dir@/xf86cvt.c \
-         @modes_dir@/xf86Crtc.h \
-         @modes_dir@/xf86Crtc.c \
-         @modes_dir@/xf86Cursors.c \
-         @modes_dir@/xf86EdidModes.c \
-         @modes_dir@/xf86gtf.c \
-         @modes_dir@/xf86RandR12.c \
-         @modes_dir@/xf86RandR12.h \
-         @modes_dir@/xf86Rename.h \
-         @modes_dir@/xf86Rotate.c \
-         @modes_dir@/xf86DiDGA.c
-
-if BUILD_XMODES
-EXTRA_nv_drv_la_SOURCES = local_xf86Rename.h
-nodist_nv_drv_la_SOURCES = $(xmode_sources)
-endif
diff --git a/src/local_xf86Rename.h b/src/local_xf86Rename.h
deleted file mode 100644
index f3a07c6..0000000
--- a/src/local_xf86Rename.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *Copyright © 2006 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no representations
- * about the suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-#define XF86NAME(x) nv_##x
commit a2dc32c5c900cbeb3fd2f99d38b64004f0ac7876
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Mon Jul 19 11:27:52 2010 -0700

    Add PCI table entries for the GeForce 315
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>

diff --git a/src/nv_driver.c b/src/nv_driver.c
index d86c314..c4b4e7a 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -125,7 +125,7 @@ _X_EXPORT DriverRec NV = {
 #endif
 };
 
-/* Known cards as of 2010/07/09 */
+/* Known cards as of 2010/07/19 */
 
 static SymTabRec NVKnownChipsets[] =
 {
@@ -563,6 +563,7 @@ static SymTabRec NVKnownChipsets[] =
   { 0x10DE087E, "ION LE" },
   { 0x10DE087F, "ION LE" },
   { 0x10DE0A20, "GeForce GT 220" },
+  { 0x10DE0A22, "GeForce 315" },
   { 0x10DE0A23, "GeForce 210" },
   { 0x10DE0A28, "GeForce GT 230M" },
   { 0x10DE0A29, "GeForce GT 330M" },
@@ -579,6 +580,7 @@ static SymTabRec NVKnownChipsets[] =
   { 0x10DE0A64, "ION" },
   { 0x10DE0A65, "GeForce 210" },
   { 0x10DE0A66, "GeForce 310" },
+  { 0x10DE0A67, "GeForce 315" },
   { 0x10DE0A68, "GeForce G105M" },
   { 0x10DE0A69, "GeForce G105M" },
   { 0x10DE0A6A, "NVS 2100M" },
@@ -600,6 +602,7 @@ static SymTabRec NVKnownChipsets[] =
   { 0x10DE0CA7, "GeForce GT 330" },
   { 0x10DE0CA8, "GeForce GTS 260M" },
   { 0x10DE0CA9, "GeForce GTS 250M" },
+  { 0x10DE0CAC, "GeForce 315" },
   { 0x10DE0CAF, "GeForce GT 335M" },
   { 0x10DE0CB0, "GeForce GTS 350M" },
   { 0x10DE0CB1, "GeForce GTS 360M" },
commit b9f1251a989c5bf69f47746a3ca4021db4798a03
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Fri Jul 9 12:53:28 2010 -0700

    Bring NVKnownChipsets up to date.
    
    Based on a suggestion from Renzo <rfabriek at nerdshack.com>
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>

diff --git a/src/nv_driver.c b/src/nv_driver.c
index f370134..d86c314 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -125,7 +125,7 @@ _X_EXPORT DriverRec NV = {
 #endif
 };
 
-/* Known cards as of 2010/03/10 */
+/* Known cards as of 2010/07/09 */
 
 static SymTabRec NVKnownChipsets[] =
 {
@@ -398,6 +398,7 @@ static SymTabRec NVKnownChipsets[] =
   { 0x10DE0403, "GeForce 8600 GS" },
   { 0x10DE0404, "GeForce 8400 GS" },
   { 0x10DE0405, "GeForce 9500M GS" },
+  { 0x10DE0406, "GeForce 8300 GS" },
   { 0x10DE0407, "GeForce 8600M GT" },
   { 0x10DE0408, "GeForce 9650M GS" },
   { 0x10DE0409, "GeForce 8700M GT" },
@@ -407,6 +408,7 @@ static SymTabRec NVKnownChipsets[] =
   { 0x10DE040D, "Quadro FX 1600M" },
   { 0x10DE040E, "Quadro FX 570" },
   { 0x10DE040F, "Quadro FX 1700" },
+  { 0x10DE0410, "GeForce GT 330" },
   { 0x10DE0420, "GeForce 8400 SE" },
   { 0x10DE0421, "GeForce 8500 GT" },
   { 0x10DE0422, "GeForce 8400 GS" },
@@ -428,7 +430,10 @@ static SymTabRec NVKnownChipsets[] =
   { 0x10DE05E2, "GeForce GTX 260" },
   { 0x10DE05E3, "GeForce GTX 285" },
   { 0x10DE05E6, "GeForce GTX 275" },
+  { 0x10DE05EA, "GeForce GTX 260" },
   { 0x10DE05EB, "GeForce GTX 295" },
+  { 0x10DE05ED, "Quadroplex 2200 D2" },
+  { 0x10DE05F8, "Quadroplex 2200 S4" },
   { 0x10DE05F9, "Quadro CX" },
   { 0x10DE05FD, "Quadro FX 5800" },
   { 0x10DE05FE, "Quadro FX 4800" },
@@ -436,6 +441,7 @@ static SymTabRec NVKnownChipsets[] =
   { 0x10DE0600, "GeForce 8800 GTS 512" },
   { 0x10DE0601, "GeForce 9800 GT" },
   { 0x10DE0602, "GeForce 8800 GT" },
+  { 0x10DE0603, "GeForce GT 230" },
   { 0x10DE0604, "GeForce 9800 GX2" },
   { 0x10DE0605, "GeForce 9800 GT" },
   { 0x10DE0606, "GeForce 8800 GS" },
@@ -446,15 +452,18 @@ static SymTabRec NVKnownChipsets[] =
   { 0x10DE060B, "GeForce 9800M GT" },
   { 0x10DE060C, "GeForce 8800M GTX" },
   { 0x10DE060D, "GeForce 8800 GS" },
+  { 0x10DE060F, "GeForce GTX 285M" },
   { 0x10DE0610, "GeForce 9600 GSO" },
   { 0x10DE0611, "GeForce 8800 GT" },
-  { 0x10DE0612, "GeForce 9800 GTX" },
+  { 0x10DE0612, "GeForce 9800 GTX/9800 GTX+" },
   { 0x10DE0613, "GeForce 9800 GTX+" },
   { 0x10DE0614, "GeForce 9800 GT" },
   { 0x10DE0615, "GeForce GTS 250" },
   { 0x10DE0617, "GeForce 9800M GTX" },
   { 0x10DE0618, "GeForce GTX 260M" },
+  { 0x10DE0619, "Quadro FX 4700 X2" },
   { 0x10DE061A, "Quadro FX 3700" },
+  { 0x10DE061B, "Quadro VX 200" },
   { 0x10DE061C, "Quadro FX 3600M" },
   { 0x10DE061D, "Quadro FX 2800M" },
   { 0x10DE061E, "Quadro FX 3700M" },
@@ -468,12 +477,19 @@ static SymTabRec NVKnownChipsets[] =
   { 0x10DE062A, "GeForce 9700M GTS" },
   { 0x10DE062B, "GeForce 9800M GS" },
   { 0x10DE062C, "GeForce 9800M GTS" },
+  { 0x10DE062D, "GeForce 9600 GT" },
+  { 0x10DE062E, "GeForce 9600 GT" },
+  { 0x10DE0631, "GeForce GTS 160M" },
+  { 0x10DE0632, "GeForce GTS 150M" },
+  { 0x10DE0635, "GeForce 9600 GSO" },
+  { 0x10DE0637, "GeForce 9600 GT" },
   { 0x10DE0638, "Quadro FX 1800" },
   { 0x10DE063A, "Quadro FX 2700M" },
   { 0x10DE0640, "GeForce 9500 GT" },
   { 0x10DE0641, "GeForce 9400 GT" },
   { 0x10DE0643, "GeForce 9500 GT" },
   { 0x10DE0644, "GeForce 9500 GS" },
+  { 0x10DE0645, "GeForce 9500 GS" },
   { 0x10DE0646, "GeForce GT 120" },
   { 0x10DE0647, "GeForce 9600M GT" },
   { 0x10DE0648, "GeForce 9600M GS" },
@@ -481,27 +497,39 @@ static SymTabRec NVKnownChipsets[] =
   { 0x10DE064A, "GeForce 9700M GT" },
   { 0x10DE064B, "GeForce 9500M G" },
   { 0x10DE064C, "GeForce 9650M GT" },
+  { 0x10DE0651, "GeForce G 110M" },
   { 0x10DE0652, "GeForce GT 130M" },
-  { 0x10DE0656, "GeForce 9500 GT" },
+  { 0x10DE0653, "GeForce GT 120M" },
+  { 0x10DE0654, "GeForce GT 220M" },
+  { 0x10DE0656, "GeForce 9650 S" },
   { 0x10DE0658, "Quadro FX 380" },
   { 0x10DE0659, "Quadro FX 580" },
   { 0x10DE065A, "Quadro FX 1700M" },
+  { 0x10DE065B, "GeForce 9400 GT" },
   { 0x10DE065C, "Quadro FX 770M" },
   { 0x10DE06E0, "GeForce 9300 GE" },
   { 0x10DE06E1, "GeForce 9300 GS" },
+  { 0x10DE06E2, "GeForce 8400" },
+  { 0x10DE06E3, "GeForce 8400 SE" },
   { 0x10DE06E4, "GeForce 8400 GS" },
   { 0x10DE06E5, "GeForce 9300M GS" },
   { 0x10DE06E6, "GeForce G100" },
+  { 0x10DE06E7, "GeForce 9300 SE" },
   { 0x10DE06E8, "GeForce 9200M GS" },
   { 0x10DE06E9, "GeForce 9300M GS" },
   { 0x10DE06EA, "Quadro NVS 150M" },
   { 0x10DE06EB, "Quadro NVS 160M" },
   { 0x10DE06EC, "GeForce G 105M" },
   { 0x10DE06EF, "GeForce G 103M" },
+  { 0x10DE06F1, "GeForce G105M" },
   { 0x10DE06F8, "Quadro NVS 420" },
   { 0x10DE06F9, "Quadro FX 370 LP" },
   { 0x10DE06FA, "Quadro NVS 450" },
+  { 0x10DE06FB, "Quadro FX 370M" },
   { 0x10DE06FD, "Quadro NVS 295" },
+  { 0x10DE0844, "GeForce 9100M G" },
+  { 0x10DE0845, "GeForce 8200M G" },
+  { 0x10DE0846, "GeForce 9200" },
   { 0x10DE0847, "GeForce 9100" },
   { 0x10DE0848, "GeForce 8300" },
   { 0x10DE0849, "GeForce 8200" },
@@ -509,32 +537,73 @@ static SymTabRec NVKnownChipsets[] =
   { 0x10DE084B, "GeForce 9200" },
   { 0x10DE084C, "nForce 980a/780a SLI" },
   { 0x10DE084D, "nForce 750a SLI" },
-  { 0x10DE084F, "GeForce 8100 / nForce 720a" },
-  { 0x10DE0844, "GeForce 9100M G" },
-  { 0x10DE0845, "GeForce 8200M G" },
+  { 0x10DE084F, "GeForce 8100 / nForce 720a"
+  { 0x10DE0860, "GeForce 9400" },
   { 0x10DE0861, "GeForce 9400" },
   { 0x10DE0862, "GeForce 9400M G" },
   { 0x10DE0863, "GeForce 9400M" },
+  { 0x10DE0864, "GeForce 9300" },
+  { 0x10DE0865, "ION" },
+  { 0x10DE0866, "GeForce 9400M G" },
+  { 0x10DE0867, "GeForce 9400" },
+  { 0x10DE0868, "nForce 760i SLI" },
+  { 0x10DE086A, "GeForce 9400" },
   { 0x10DE086C, "GeForce 9300 / nForce 730i" },
+  { 0x10DE086D, "GeForce 9200" },
+  { 0x10DE086E, "GeForce 9100M G" },
+  { 0x10DE086F, "GeForce 8200M G" },
+  { 0x10DE0870, "GeForce 9400M" },
+  { 0x10DE0871, "GeForce 9200" },
   { 0x10DE0872, "GeForce G102M" },
   { 0x10DE0873, "GeForce G102M" },
+  { 0x10DE0874, "ION" },
+  { 0x10DE0876, "ION" },
   { 0x10DE087A, "GeForce 9400" },
   { 0x10DE087D, "ION" },
+  { 0x10DE087E, "ION LE" },
   { 0x10DE087F, "ION LE" },
   { 0x10DE0A20, "GeForce GT 220" },
   { 0x10DE0A23, "GeForce 210" },
+  { 0x10DE0A28, "GeForce GT 230M" },
+  { 0x10DE0A29, "GeForce GT 330M" },
   { 0x10DE0A2A, "GeForce GT 230M" },
+  { 0x10DE0A2B, "GeForce GT 330M" },
+  { 0x10DE0A2C, "NVS 5100M" },
+  { 0x10DE0A2D, "GeForce GT 320M" },
   { 0x10DE0A34, "GeForce GT 240M" },
+  { 0x10DE0A35, "GeForce GT 325M" },
+  { 0x10DE0A3C, "Quadro FX 880M" },
   { 0x10DE0A60, "GeForce G210" },
   { 0x10DE0A62, "GeForce 205" },
   { 0x10DE0A63, "GeForce 310" },
+  { 0x10DE0A64, "ION" },
   { 0x10DE0A65, "GeForce 210" },
   { 0x10DE0A66, "GeForce 310" },
+  { 0x10DE0A68, "GeForce G105M" },
+  { 0x10DE0A69, "GeForce G105M" },
+  { 0x10DE0A6A, "NVS 2100M" },
+  { 0x10DE0A6C, "NVS 3100M" },
+  { 0x10DE0A6E, "GeForce 305M" },
+  { 0x10DE0A6F, "ION" },
+  { 0x10DE0A70, "GeForce 310M" },
+  { 0x10DE0A71, "GeForce 305M" },
+  { 0x10DE0A72, "GeForce 310M" },
+  { 0x10DE0A73, "GeForce 305M" },
   { 0x10DE0A74, "GeForce G210M" },
+  { 0x10DE0A75, "GeForce 310M" },
   { 0x10DE0A78, "Quadro FX 380 LP" },
+  { 0x10DE0A7C, "Quadro FX 380M" },
+  { 0x10DE0CA0, "GeForce GT 330" },
+  { 0x10DE0CA2, "GeForce GT 320" },
   { 0x10DE0CA3, "GeForce GT 240" },
+  { 0x10DE0CA4, "GeForce GT 340" },
+  { 0x10DE0CA7, "GeForce GT 330" },
   { 0x10DE0CA8, "GeForce GTS 260M" },
   { 0x10DE0CA9, "GeForce GTS 250M" },
+  { 0x10DE0CAF, "GeForce GT 335M" },
+  { 0x10DE0CB0, "GeForce GTS 350M" },
+  { 0x10DE0CB1, "GeForce GTS 360M" },
+  { 0x10DE0CBC, "Quadro FX 1800M" },
 
   {-1, NULL}
 };


More information about the xorg-commit mailing list