Ubuntu
xserver-xorg-video-nv package

Merge lp:~ubuntu-branches/ubuntu/maverick/xserver-xorg-video-nv/maverick-201006080912 into lp:ubuntu/maverick/xserver-xorg-video-nv

  1. Maverick (10.10)
  2. maverick-201006080912
  3. Merge into maverick
Proposed by James Westby
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/maverick/xserver-xorg-video-nv/maverick-201006080912
Merge into: lp:ubuntu/maverick/xserver-xorg-video-nv
Diff against target: 2541 lines (+2489/-1) (has conflicts)
6 files modified
debian/changelog (+92/-0)
debian/patches/0001-Move-the-logic-for-matching-devices-out-of-probe-rou.patch (+1264/-0)
debian/patches/0002-Run-the-parsing-script-to-generate-an-initial-list-o.patch (+1007/-0)
debian/patches/105_gf7025_gf7050.patch (+111/-0)
debian/patches/series (+10/-1)
debian/rules (+5/-0)
Text conflict in debian/changelog
Text conflict in debian/patches/series
Text conflict in debian/rules
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/maverick/xserver-xorg-video-nv/maverick-201006080912

Description of the change

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/maverick/xserver-xorg-video-nv now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/xserver-xorg-video-nv/maverick-201006080912. A merge should be performed if necessary.

To post a comment you must log in.

Unmerged revisions

41. By Michael Vogt

merged from debian

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-06-08 18:22:37 +0000
3+++ debian/changelog 2010-06-08 09:18:27 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 xserver-xorg-video-nv (1:2.1.17-3ubuntu1) maverick; urgency=low
7
8 * Merge from Debian unstable. Remaining Ubuntu changes:
9@@ -86,6 +87,96 @@
10
11 -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 07 Dec 2009 17:48:09 +0200
12
13+=======
14+xserver-xorg-video-nv (1:2.1.17-3ubuntu1) UNRELEASED; urgency=low
15+
16+ * Merge from Debian unstable, remaining changes:
17+ - 100_fedora-panel-fix.patch:
18+ Don't discard EDID blocks just because their input type bit
19+ disagrees with the hardware connection sensing; this usually
20+ just means the block is lying. (cf. LP: 188549).
21+ - 0001-Move-the-logic-for-matching-devices-out-of-probe-rou.patch
22+ + Disable the logic for matching devices in the probe routine.
23+ + Instead match explicitly on pci_id_match (LP: 385658)
24+ - 0002-Run-the-parsing-script-to-generate-an-initial-list-o.patch
25+ + Generate the list of devices to match once
26+ * dropped 105_gf7025_gf7050.patch, part of upstream
27+
28+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 01 Jun 2010 14:41:21 +0200
29+
30+xserver-xorg-video-nv (1:2.1.17-3) unstable; urgency=low
31+
32+ * Add patch to link against libpciaccess and libdrm, to ensure correct
33+ dependencies.
34+ * Make the libdrm-dev build-dep !hurd-i386.
35+
36+ -- Julien Cristau <jcristau@debian.org> Sat, 15 May 2010 13:38:58 +0200
37+
38+xserver-xorg-video-nv (1:2.1.17-2) unstable; urgency=low
39+
40+ * Merge upstream's master as of 17ab5dbea6. This includes the “Refuse to
41+ bind to a device which has kernel modesetting active.” commit, which
42+ makes sure nv doesn't break console output when nouveau's KMS is
43+ active.
44+ * Add libdrm-dev and x11proto-xf86dri-dev to Build-Depends to enable the
45+ appropriate codepath.
46+ * Add myself to Uploaders.
47+ * Use new xsfbs and ${xviddriver:Depends} variable (bumping the
48+ xserver-xorg-dev version in Build-Depends accordingly).
49+
50+ -- Cyril Brulebois <kibi@debian.org> Sun, 18 Apr 2010 12:13:58 +0200
51+
52+xserver-xorg-video-nv (1:2.1.17-1) unstable; urgency=low
53+
54+ [ Julien Cristau ]
55+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
56+ good reason. Thanks, Colin Watson!
57+ * Remove myself from Uploaders
58+
59+ [ Brice Goglin ]
60+ * New upstream release.
61+ + Fix support for Xserver 1.7, closes: #568170.
62+ + Add support for ION boards, closes: #540500.
63+ * Bump Standards-Version to 3.8.4, no changes needed.
64+
65+ -- Brice Goglin <bgoglin@debian.org> Tue, 09 Mar 2010 07:19:12 +0100
66+
67+xserver-xorg-video-nv (1:2.1.15-1ubuntu3) lucid; urgency=low
68+
69+ * revert debian/patches/110_do_not_crash_on_17.patch
70+ while it fixes the crash it gives funny colors. fix the
71+ crash in the xserver instead
72+
73+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 07 Jan 2010 15:51:29 +0100
74+
75+xserver-xorg-video-nv (1:2.1.15-1ubuntu2) lucid; urgency=low
76+
77+ * debian/patches/110_do_not_crash_on_17.patch:
78+ - merge git fix for LP: #494627
79+ (from http://cgit.freedesktop.org/xorg/driver/xf86-video-nv/commit/?id=85638b2f0acc418aa77241dd123f7de76ea3ce8f)
80+
81+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 05 Jan 2010 13:24:33 +0100
82+
83+xserver-xorg-video-nv (1:2.1.15-1ubuntu1) lucid; urgency=low
84+
85+ * Merge from Debian experimental, remaining changes:
86+ - Re-enabled the patch system, we need that. Add quilt in build-deps.
87+ - 100_fedora-panel-fix.patch:
88+ Don't discard EDID blocks just because their input type bit
89+ disagrees with the hardware connection sensing; this usually
90+ just means the block is lying. (cf. LP: 188549).
91+ - 105_gf7025_gf7050.patch:
92+ Fedora patch to add support for 7025/7050 IGP chipsets.
93+ (LP: 220364)
94+ - 0001-Move-the-logic-for-matching-devices-out-of-probe-rou.patch
95+ + Disable the logic for matching devices in the probe routine.
96+ + Instead match explicitly on pci_id_match (LP: 385658)
97+ - 0002-Run-the-parsing-script-to-generate-an-initial-list-o.patch
98+ + Generate the list of devices to match once
99+
100+ -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 07 Dec 2009 17:48:09 +0200
101+
102+>>>>>>> MERGE-SOURCE
103 xserver-xorg-video-nv (1:2.1.15-1) experimental; urgency=low
104
105 [ Timo Aaltonen ]
106@@ -536,3 +627,4 @@
107 * First xserver-xorg-driver-nv release.
108
109 -- Daniel Stone <daniel.stone@ubuntu.com> Wed, 6 Jul 2005 15:48:17 +1000
110+
111
112=== added file 'debian/patches/0001-Move-the-logic-for-matching-devices-out-of-probe-rou.patch'
113--- debian/patches/0001-Move-the-logic-for-matching-devices-out-of-probe-rou.patch 1970-01-01 00:00:00 +0000
114+++ debian/patches/0001-Move-the-logic-for-matching-devices-out-of-probe-rou.patch 2010-06-08 09:18:27 +0000
115@@ -0,0 +1,1264 @@
116+From eaa2ba0e31ea40f6d1cab60594fad3a90f6181ce Mon Sep 17 00:00:00 2001
117+From: Mario Limonciello <mario_limonciello@dell.com>
118+Date: Sat, 12 Sep 2009 09:11:48 -0500
119+Subject: [PATCH] Move the logic for matching devices out of probe routine.
120+
121+This prevents the X server from "claiming" a slot but not
122+freeing it up since the driver used to abort on the probe routine.
123+
124+To achieve this a few things had to be done:
125+ 1) Move the list of devices into a parsable CSV file.
126+ 2) Add a parsing perl script for generating the two static
127+ arrays that contain all the device lists. This came from
128+ initially xf86-video-ati with some modifications.
129+ 3) Disable any code in the probe routine that was "ignoring"
130+ devices.
131+---
132+ src/nv_driver.c | 452 +-------------------------
133+ src/pcidb/nv_list.csv | 638 +++++++++++++++++++++++++++++++++++++
134+ src/pcidb/parse_pci_ids.pl | 82 +++++
135+ 3 files changed, 729 insertions(+), 443 deletions(-)
136+ create mode 100644 src/nvidia_chipset_gen.h
137+ create mode 100644 src/nvidia_pci_device_match_gen.h
138+ create mode 100644 src/pcidb/nv_list.csv
139+ create mode 100755 src/pcidb/parse_pci_ids.pl
140+
141+diff --git a/src/nv_driver.c b/src/nv_driver.c
142+index a7cf2dc..1dd1b3e 100644
143+--- a/src/nv_driver.c
144++++ b/src/nv_driver.c
145+@@ -32,6 +32,9 @@
146+ #include "xf86int10.h"
147+ #include "vbeModes.h"
148+
149++#include "nvidia_chipset_gen.h"
150++#include "nvidia_pci_device_match_gen.h"
151++
152+ const OptionInfoRec * RivaAvailableOptions(int chipid, int busid);
153+ Bool RivaGetScrnInfoRec(PciChipsets *chips, int chip);
154+ Bool G80GetScrnInfoRec(PciChipsets *chips, int chip);
155+@@ -76,27 +79,6 @@ static void NVRestore(ScrnInfoPtr pScrn);
156+ static Bool NVModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
157+ static Bool NVSetModeVBE(ScrnInfoPtr pScrn, DisplayModePtr pMode);
158+
159+-#if XSERVER_LIBPCIACCESS
160+-/* For now, just match any NVIDIA display device and sort through them in the
161+- * probe routine */
162+-
163+-/*
164+- * libpciaccess's masks are shifted by 8 bits compared to the ones in xf86Pci.h.
165+- */
166+-#define LIBPCIACCESS_CLASS_SHIFT (PCI_CLASS_SHIFT - 8)
167+-#define LIBPCIACCESS_CLASS_MASK (PCI_CLASS_MASK >> 8)
168+-
169+-static const struct pci_id_match NVPciIdMatchList[] = {
170+- { PCI_VENDOR_NVIDIA, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY,
171+- PCI_CLASS_DISPLAY << LIBPCIACCESS_CLASS_SHIFT, LIBPCIACCESS_CLASS_MASK, 0 },
172+-
173+- { PCI_VENDOR_NVIDIA_SGS, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY,
174+- PCI_CLASS_DISPLAY << LIBPCIACCESS_CLASS_SHIFT, LIBPCIACCESS_CLASS_MASK, 0 },
175+-
176+- { 0, 0, 0 }
177+-};
178+-#endif
179+-
180+ /*
181+ * This contains the functions needed by the server after loading the
182+ * driver module. It must be supplied, and gets added the driver list by
183+@@ -124,369 +106,6 @@ _X_EXPORT DriverRec NV = {
184+ #endif
185+ };
186+
187+-/* Known cards as of 2009/05/15 */
188+-
189+-static SymTabRec NVKnownChipsets[] =
190+-{
191+- { 0x12D20018, "RIVA 128" },
192+-
193+- { 0x10DE0020, "RIVA TNT" },
194+-
195+- { 0x10DE0028, "RIVA TNT2" },
196+- { 0x10DE002A, "Unknown TNT2" },
197+- { 0x10DE002C, "Vanta" },
198+- { 0x10DE0029, "RIVA TNT2 Ultra" },
199+- { 0x10DE002D, "RIVA TNT2 Model 64" },
200+-
201+- { 0x10DE00A0, "Aladdin TNT2" },
202+-
203+- { 0x10DE0100, "GeForce 256" },
204+- { 0x10DE0101, "GeForce DDR" },
205+- { 0x10DE0103, "Quadro" },
206+-
207+- { 0x10DE0110, "GeForce2 MX/MX 400" },
208+- { 0x10DE0111, "GeForce2 MX 100/200" },
209+- { 0x10DE0112, "GeForce2 Go" },
210+- { 0x10DE0113, "Quadro2 MXR/EX/Go" },
211+-
212+- { 0x10DE01A0, "GeForce2 Integrated GPU" },
213+-
214+- { 0x10DE0150, "GeForce2 GTS" },
215+- { 0x10DE0151, "GeForce2 Ti" },
216+- { 0x10DE0152, "GeForce2 Ultra" },
217+- { 0x10DE0153, "Quadro2 Pro" },
218+-
219+- { 0x10DE0170, "GeForce4 MX 460" },
220+- { 0x10DE0171, "GeForce4 MX 440" },
221+- { 0x10DE0172, "GeForce4 MX 420" },
222+- { 0x10DE0173, "GeForce4 MX 440-SE" },
223+- { 0x10DE0174, "GeForce4 440 Go" },
224+- { 0x10DE0175, "GeForce4 420 Go" },
225+- { 0x10DE0176, "GeForce4 420 Go 32M" },
226+- { 0x10DE0177, "GeForce4 460 Go" },
227+- { 0x10DE0178, "Quadro4 550 XGL" },
228+-#if defined(__powerpc__)
229+- { 0x10DE0179, "GeForce4 MX (Mac)" },
230+-#else
231+- { 0x10DE0179, "GeForce4 440 Go 64M" },
232+-#endif
233+- { 0x10DE017A, "Quadro NVS" },
234+- { 0x10DE017C, "Quadro4 500 GoGL" },
235+- { 0x10DE017D, "GeForce4 410 Go 16M" },
236+-
237+- { 0x10DE0181, "GeForce4 MX 440 with AGP8X" },
238+- { 0x10DE0182, "GeForce4 MX 440SE with AGP8X" },
239+- { 0x10DE0183, "GeForce4 MX 420 with AGP8X" },
240+- { 0x10DE0185, "GeForce4 MX 4000" },
241+- { 0x10DE0186, "GeForce4 448 Go" },
242+- { 0x10DE0187, "GeForce4 488 Go" },
243+- { 0x10DE0188, "Quadro4 580 XGL" },
244+-#if defined(__powerpc__)
245+- { 0x10DE0189, "GeForce4 MX with AGP8X (Mac)" },
246+-#endif
247+- { 0x10DE018A, "Quadro4 NVS 280 SD" },
248+- { 0x10DE018B, "Quadro4 380 XGL" },
249+- { 0x10DE018C, "Quadro NVS 50 PCI" },
250+- { 0x10DE018D, "GeForce4 448 Go" },
251+-
252+- { 0x10DE01F0, "GeForce4 MX Integrated GPU" },
253+-
254+- { 0x10DE0200, "GeForce3" },
255+- { 0x10DE0201, "GeForce3 Ti 200" },
256+- { 0x10DE0202, "GeForce3 Ti 500" },
257+- { 0x10DE0203, "Quadro DCC" },
258+-
259+- { 0x10DE0250, "GeForce4 Ti 4600" },
260+- { 0x10DE0251, "GeForce4 Ti 4400" },
261+- { 0x10DE0253, "GeForce4 Ti 4200" },
262+- { 0x10DE0258, "Quadro4 900 XGL" },
263+- { 0x10DE0259, "Quadro4 750 XGL" },
264+- { 0x10DE025B, "Quadro4 700 XGL" },
265+-
266+- { 0x10DE0280, "GeForce4 Ti 4800" },
267+- { 0x10DE0281, "GeForce4 Ti 4200 with AGP8X" },
268+- { 0x10DE0282, "GeForce4 Ti 4800 SE" },
269+- { 0x10DE0286, "GeForce4 4200 Go" },
270+- { 0x10DE028C, "Quadro4 700 GoGL" },
271+- { 0x10DE0288, "Quadro4 980 XGL" },
272+- { 0x10DE0289, "Quadro4 780 XGL" },
273+-
274+- { 0x10DE0301, "GeForce FX 5800 Ultra" },
275+- { 0x10DE0302, "GeForce FX 5800" },
276+- { 0x10DE0308, "Quadro FX 2000" },
277+- { 0x10DE0309, "Quadro FX 1000" },
278+-
279+- { 0x10DE0311, "GeForce FX 5600 Ultra" },
280+- { 0x10DE0312, "GeForce FX 5600" },
281+- { 0x10DE0314, "GeForce FX 5600XT" },
282+- { 0x10DE031A, "GeForce FX Go5600" },
283+- { 0x10DE031B, "GeForce FX Go5650" },
284+- { 0x10DE031C, "Quadro FX Go700" },
285+-
286+- { 0x10DE0320, "GeForce FX 5200" },
287+- { 0x10DE0321, "GeForce FX 5200 Ultra" },
288+- { 0x10DE0322, "GeForce FX 5200" },
289+- { 0x10DE0323, "GeForce FX 5200LE" },
290+- { 0x10DE0324, "GeForce FX Go5200" },
291+- { 0x10DE0325, "GeForce FX Go5250" },
292+- { 0x10DE0326, "GeForce FX 5500" },
293+- { 0x10DE0327, "GeForce FX 5100" },
294+- { 0x10DE0328, "GeForce FX Go5200 32M/64M" },
295+-#if defined(__powerpc__)
296+- { 0x10DE0329, "GeForce FX 5200 (Mac)" },
297+-#endif
298+- { 0x10DE032A, "Quadro NVS 55/280 PCI" },
299+- { 0x10DE032B, "Quadro FX 500/600 PCI" },
300+- { 0x10DE032C, "GeForce FX Go53xx Series" },
301+- { 0x10DE032D, "GeForce FX Go5100" },
302+-
303+- { 0x10DE0330, "GeForce FX 5900 Ultra" },
304+- { 0x10DE0331, "GeForce FX 5900" },
305+- { 0x10DE0332, "GeForce FX 5900XT" },
306+- { 0x10DE0333, "GeForce FX 5950 Ultra" },
307+- { 0x10DE0334, "GeForce FX 5900ZT" },
308+- { 0x10DE0338, "Quadro FX 3000" },
309+- { 0x10DE033F, "Quadro FX 700" },
310+-
311+- { 0x10DE0341, "GeForce FX 5700 Ultra" },
312+- { 0x10DE0342, "GeForce FX 5700" },
313+- { 0x10DE0343, "GeForce FX 5700LE" },
314+- { 0x10DE0344, "GeForce FX 5700VE" },
315+- { 0x10DE0347, "GeForce FX Go5700" },
316+- { 0x10DE0348, "GeForce FX Go5700" },
317+- { 0x10DE034C, "Quadro FX Go1000" },
318+- { 0x10DE034E, "Quadro FX 1100" },
319+-
320+- { 0x10DE0040, "GeForce 6800 Ultra" },
321+- { 0x10DE0041, "GeForce 6800" },
322+- { 0x10DE0042, "GeForce 6800 LE" },
323+- { 0x10DE0043, "GeForce 6800 XE" },
324+- { 0x10DE0044, "GeForce 6800 XT" },
325+- { 0x10DE0045, "GeForce 6800 GT" },
326+- { 0x10DE0046, "GeForce 6800 GT" },
327+- { 0x10DE0047, "GeForce 6800 GS" },
328+- { 0x10DE0048, "GeForce 6800 XT" },
329+- { 0x10DE004E, "Quadro FX 4000" },
330+-
331+- { 0x10DE00C0, "GeForce 6800 GS" },
332+- { 0x10DE00C1, "GeForce 6800" },
333+- { 0x10DE00C2, "GeForce 6800 LE" },
334+- { 0x10DE00C3, "GeForce 6800 XT" },
335+- { 0x10DE00C8, "GeForce Go 6800" },
336+- { 0x10DE00C9, "GeForce Go 6800 Ultra" },
337+- { 0x10DE00CC, "Quadro FX Go1400" },
338+- { 0x10DE00CD, "Quadro FX 3450/4000 SDI" },
339+- { 0x10DE00CE, "Quadro FX 1400" },
340+-
341+- { 0x10DE0140, "GeForce 6600 GT" },
342+- { 0x10DE0141, "GeForce 6600" },
343+- { 0x10DE0142, "GeForce 6600 LE" },
344+- { 0x10DE0143, "GeForce 6600 VE" },
345+- { 0x10DE0144, "GeForce Go 6600" },
346+- { 0x10DE0145, "GeForce 6610 XL" },
347+- { 0x10DE0146, "GeForce Go 6600 TE/6200 TE" },
348+- { 0x10DE0147, "GeForce 6700 XL" },
349+- { 0x10DE0148, "GeForce Go 6600" },
350+- { 0x10DE0149, "GeForce Go 6600 GT" },
351+- { 0x10DE014A, "Quadro NVS 440" },
352+- { 0x10DE014C, "Quadro FX 550" },
353+- { 0x10DE014D, "Quadro FX 550" },
354+- { 0x10DE014E, "Quadro FX 540" },
355+- { 0x10DE014F, "GeForce 6200" },
356+-
357+- { 0x10DE0160, "GeForce 6500" },
358+- { 0x10DE0161, "GeForce 6200 TurboCache(TM)" },
359+- { 0x10DE0162, "GeForce 6200SE TurboCache(TM)" },
360+- { 0x10DE0163, "GeForce 6200 LE" },
361+- { 0x10DE0164, "GeForce Go 6200" },
362+- { 0x10DE0165, "Quadro NVS 285" },
363+- { 0x10DE0166, "GeForce Go 6400" },
364+- { 0x10DE0167, "GeForce Go 6200" },
365+- { 0x10DE0168, "GeForce Go 6400" },
366+- { 0x10DE0169, "GeForce 6250" },
367+- { 0x10DE016A, "GeForce 7100 GS" },
368+-
369+- { 0x10DE0211, "GeForce 6800" },
370+- { 0x10DE0212, "GeForce 6800 LE" },
371+- { 0x10DE0215, "GeForce 6800 GT" },
372+- { 0x10DE0218, "GeForce 6800 XT" },
373+-
374+- { 0x10DE0221, "GeForce 6200" },
375+- { 0x10DE0222, "GeForce 6200 A-LE" },
376+-
377+- { 0x10DE0090, "GeForce 7800 GTX" },
378+- { 0x10DE0091, "GeForce 7800 GTX" },
379+- { 0x10DE0092, "GeForce 7800 GT" },
380+- { 0x10DE0093, "GeForce 7800 GS" },
381+- { 0x10DE0095, "GeForce 7800 SLI" },
382+- { 0x10DE0098, "GeForce Go 7800" },
383+- { 0x10DE0099, "GeForce Go 7800 GTX" },
384+- { 0x10DE009D, "Quadro FX 4500" },
385+-
386+- { 0x10DE01D0, "GeForce 7350 LE" },
387+- { 0x10DE01D1, "GeForce 7300 LE" },
388+- { 0x10DE01D3, "GeForce 7300 SE" },
389+- { 0x10DE01D6, "GeForce Go 7200" },
390+- { 0x10DE01D7, "GeForce Go 7300" },
391+- { 0x10DE01D8, "GeForce Go 7400" },
392+- { 0x10DE01D9, "GeForce Go 7400 GS" },
393+- { 0x10DE01DA, "Quadro NVS 110M" },
394+- { 0x10DE01DB, "Quadro NVS 120M" },
395+- { 0x10DE01DC, "Quadro FX 350M" },
396+- { 0x10DE01DD, "GeForce 7500 LE" },
397+- { 0x10DE01DE, "Quadro FX 350" },
398+- { 0x10DE01DF, "GeForce 7300 GS" },
399+-
400+- { 0x10DE0390, "GeForce 7650 GS" },
401+- { 0x10DE0391, "GeForce 7600 GT" },
402+- { 0x10DE0392, "GeForce 7600 GS" },
403+- { 0x10DE0393, "GeForce 7300 GT" },
404+- { 0x10DE0394, "GeForce 7600 LE" },
405+- { 0x10DE0395, "GeForce 7300 GT" },
406+- { 0x10DE0397, "GeForce Go 7700" },
407+- { 0x10DE0398, "GeForce Go 7600" },
408+- { 0x10DE0399, "GeForce Go 7600 GT"},
409+- { 0x10DE039A, "Quadro NVS 300M" },
410+- { 0x10DE039B, "GeForce Go 7900 SE" },
411+- { 0x10DE039C, "Quadro FX 550M" },
412+- { 0x10DE039E, "Quadro FX 560" },
413+-
414+- { 0x10DE0290, "GeForce 7900 GTX" },
415+- { 0x10DE0291, "GeForce 7900 GT" },
416+- { 0x10DE0292, "GeForce 7900 GS" },
417+- { 0x10DE0293, "GeForce 7950 GX2" },
418+- { 0x10DE0294, "GeForce 7950 GX2" },
419+- { 0x10DE0295, "GeForce 7950 GT"},
420+- { 0x10DE0297, "GeForce Go 7950 GTX" },
421+- { 0x10DE0298, "GeForce Go 7900 GS" },
422+- { 0x10DE0299, "GeForce Go 7900 GTX" },
423+- { 0x10DE029A, "Quadro FX 2500M" },
424+- { 0x10DE029B, "Quadro FX 1500M" },
425+- { 0x10DE029C, "Quadro FX 5500" },
426+- { 0x10DE029D, "Quadro FX 3500" },
427+- { 0x10DE029E, "Quadro FX 1500" },
428+- { 0x10DE029F, "Quadro FX 4500 X2" },
429+-
430+- { 0x10DE0240, "GeForce 6150" },
431+- { 0x10DE0241, "GeForce 6150 LE" },
432+- { 0x10DE0242, "GeForce 6100" },
433+- { 0x10DE0244, "GeForce Go 6150" },
434+- { 0x10DE0245, "Quadro NVS 210S / NVIDIA GeForce 6150LE" },
435+- { 0x10DE0247, "GeForce Go 6100" },
436+-
437+- { 0x10DE03D0, "GeForce 6150SE" },
438+- { 0x10DE03D1, "GeForce 6100 nForce 405" },
439+- { 0x10DE03D2, "GeForce 6100 nForce 400" },
440+- { 0x10DE03D5, "GeForce 6100 nForce 420" },
441+-
442+-/*************** G8x ***************/
443+- { 0x10DE0191, "GeForce 8800 GTX" },
444+- { 0x10DE0193, "GeForce 8800 GTS" },
445+- { 0x10DE0194, "GeForce 8800 Ultra" },
446+- { 0x10DE019D, "Quadro FX 5600" },
447+- { 0x10DE019E, "Quadro FX 4600" },
448+- { 0x10DE0400, "GeForce 8600 GTS" },
449+- { 0x10DE0401, "GeForce 8600 GT" },
450+- { 0x10DE0402, "GeForce 8600 GT" },
451+- { 0x10DE0403, "GeForce 8600 GS" },
452+- { 0x10DE0404, "GeForce 8400 GS" },
453+- { 0x10DE0405, "GeForce 9500M GS" },
454+- { 0x10DE0407, "GeForce 8600M GT" },
455+- { 0x10DE0408, "GeForce 9650M GS" },
456+- { 0x10DE0409, "GeForce 8700M GT" },
457+- { 0x10DE040A, "Quadro FX 370" },
458+- { 0x10DE040B, "Quadro NVS 320M" },
459+- { 0x10DE040C, "Quadro FX 570M" },
460+- { 0x10DE040D, "Quadro FX 1600M" },
461+- { 0x10DE040E, "Quadro FX 570" },
462+- { 0x10DE040F, "Quadro FX 1700" },
463+- { 0x10DE0420, "GeForce 8400 SE" },
464+- { 0x10DE0421, "GeForce 8500 GT" },
465+- { 0x10DE0422, "GeForce 8400 GS" },
466+- { 0x10DE0423, "GeForce 8300 GS" },
467+- { 0x10DE0424, "GeForce 8400 GS" },
468+- { 0x10DE0425, "GeForce 8600M GS" },
469+- { 0x10DE0426, "GeForce 8400M GT" },
470+- { 0x10DE0427, "GeForce 8400M GS" },
471+- { 0x10DE0428, "GeForce 8400M G" },
472+- { 0x10DE0429, "Quadro NVS 140M" },
473+- { 0x10DE042A, "Quadro NVS 130M" },
474+- { 0x10DE042B, "Quadro NVS 135M" },
475+- { 0x10DE042C, "GeForce 9400 GT" },
476+- { 0x10DE042D, "Quadro FX 360M" },
477+- { 0x10DE042E, "GeForce 9300M G" },
478+- { 0x10DE042F, "Quadro NVS 290" },
479+- { 0x10DE05E0, "GeForce GTX 295" },
480+- { 0x10DE05E1, "GeForce GTX 280" },
481+- { 0x10DE05E2, "GeForce GTX 260" },
482+- { 0x10DE05E3, "GeForce GTX 285" },
483+- { 0x10DE05F9, "Quadro CX" },
484+- { 0x10DE05FD, "Quadro FX 5800" },
485+- { 0x10DE05FE, "Quadro FX 4800" },
486+- { 0x10DE05FF, "Quadro FX 3800" },
487+- { 0x10DE0600, "GeForce 8800 GTS 512" },
488+- { 0x10DE0601, "GeForce 9800 GT" },
489+- { 0x10DE0602, "GeForce 8800 GT" },
490+- { 0x10DE0604, "GeForce 9800 GX2" },
491+- { 0x10DE0605, "GeForce 9800 GT" },
492+- { 0x10DE0606, "GeForce 8800 GS" },
493+- { 0x10DE0608, "GeForce 9800M GTX" },
494+- { 0x10DE0609, "GeForce 8800M GTS" },
495+- { 0x10DE060B, "GeForce 9800M GT" },
496+- { 0x10DE060C, "GeForce 8800M GTX" },
497+- { 0x10DE060D, "GeForce 8800 GS" },
498+- { 0x10DE0610, "GeForce 9600 GSO" },
499+- { 0x10DE0611, "GeForce 8800 GT" },
500+- { 0x10DE0612, "GeForce 9800 GTX" },
501+- { 0x10DE0613, "GeForce 9800 GTX+" },
502+- { 0x10DE0614, "GeForce 9800 GT" },
503+- { 0x10DE0615, "GeForce GTS 250" },
504+- { 0x10DE0617, "GeForce 9800M GTX" },
505+- { 0x10DE061A, "Quadro FX 3700" },
506+- { 0x10DE061C, "Quadro FX 3600M" },
507+- { 0x10DE061E, "Quadro FX 3700M" },
508+- { 0x10DE0622, "GeForce 9600 GT" },
509+- { 0x10DE0623, "GeForce 9600 GS" },
510+- { 0x10DE0625, "GeForce 9600 GSO 512" },
511+- { 0x10DE0626, "GeForce GT 130" },
512+- { 0x10DE0627, "GeForce GT 140" },
513+- { 0x10DE0628, "GeForce 9800M GTS" },
514+- { 0x10DE062A, "GeForce 9700M GTS" },
515+- { 0x10DE062B, "GeForce 9800M GS" },
516+- { 0x10DE062C, "GeForce 9800M GTS" },
517+- { 0x10DE0638, "Quadro FX 1800" },
518+- { 0x10DE063A, "Quadro FX 2700M" },
519+- { 0x10DE0640, "GeForce 9500 GT" },
520+- { 0x10DE0641, "GeForce 9400 GT" },
521+- { 0x10DE0643, "GeForce 9500 GT" },
522+- { 0x10DE0646, "GeForce GT 120" },
523+- { 0x10DE0647, "GeForce 9600M GT" },
524+- { 0x10DE0648, "GeForce 9600M GS" },
525+- { 0x10DE0649, "GeForce 9600M GT" },
526+- { 0x10DE064A, "GeForce 9700M GT" },
527+- { 0x10DE064B, "GeForce 9500M G" },
528+- { 0x10DE064C, "GeForce 9650M GT" },
529+- { 0x10DE0656, "GeForce 9500 GT" },
530+- { 0x10DE0658, "Quadro FX 380" },
531+- { 0x10DE0659, "Quadro FX 580" },
532+- { 0x10DE065C, "Quadro FX 770M" },
533+- { 0x10DE06E0, "GeForce 9300 GE" },
534+- { 0x10DE06E1, "GeForce 9300 GS" },
535+- { 0x10DE06E4, "GeForce 8400 GS" },
536+- { 0x10DE06E5, "GeForce 9300M GS" },
537+- { 0x10DE06E6, "GeForce G100" },
538+- { 0x10DE06E8, "GeForce 9200M GS" },
539+- { 0x10DE06E9, "GeForce 9300M GS" },
540+- { 0x10DE06EA, "Quadro NVS 150M" },
541+- { 0x10DE06EB, "Quadro NVS 160M" },
542+- { 0x10DE06F8, "Quadro NVS 420" },
543+- { 0x10DE06F9, "Quadro FX 370 LP" },
544+- { 0x10DE06FA, "Quadro NVS 450" },
545+- { 0x10DE06FD, "Quadro NVS 295" },
546+-
547+- {-1, NULL}
548+-};
549+-
550+ #ifdef XFree86LOADER
551+
552+ static MODULESETUPPROTO(nvSetup);
553+@@ -736,40 +355,6 @@ NVIsG80(int chipType)
554+ return FALSE;
555+ }
556+
557+-static Bool
558+-NVIsSupported(CARD32 id)
559+-{
560+- /* look for a compatible devices which may be newer than
561+- the NVKnownChipsets list above. */
562+- switch(id & 0xfff0) {
563+- case 0x0040:
564+- case 0x0090:
565+- case 0x00C0:
566+- case 0x0120:
567+- case 0x0140:
568+- case 0x0160:
569+- case 0x0170:
570+- case 0x0180:
571+- case 0x01D0:
572+- case 0x0210:
573+- case 0x0220:
574+- case 0x0240:
575+- case 0x0250:
576+- case 0x0280:
577+- case 0x0290:
578+- case 0x0300:
579+- case 0x0310:
580+- case 0x0320:
581+- case 0x0330:
582+- case 0x0340:
583+- case 0x0390:
584+- case 0x03D0:
585+- return TRUE;
586+- }
587+-
588+- return FALSE;
589+-}
590+-
591+ /* Mandatory */
592+ #if XSERVER_LIBPCIACCESS
593+ static Bool
594+@@ -780,21 +365,6 @@ NVPciProbe(DriverPtr drv, int entity, struct pci_device *dev, intptr_t data)
595+ NVGetPCIXpressChip(dev) : dev->vendor_id << 16 | dev->device_id;
596+ const char *name = xf86TokenToString(NVKnownChipsets, id);
597+
598+- if(dev->vendor_id == PCI_VENDOR_NVIDIA && !name &&
599+- !NVIsSupported(id) && !NVIsG80(id)) {
600+- /* See if pci.ids knows what the heck this thing is */
601+- name = pci_device_get_device_name(dev);
602+- if(name)
603+- xf86DrvMsg(0, X_WARNING,
604+- NV_NAME ": Ignoring unsupported device 0x%x (%s) at %2.2x@%2.2x:%2.2x:%1.1x\n",
605+- id, name, dev->bus, dev->domain, dev->dev, dev->func);
606+- else
607+- xf86DrvMsg(0, X_WARNING,
608+- NV_NAME ": Ignoring unsupported device 0x%x at %2.2x@%2.2x:%2.2x:%1.1x\n",
609+- id, dev->bus, dev->domain, dev->dev, dev->func);
610+- return FALSE;
611+- }
612+-
613+ if(!name)
614+ name = pci_device_get_device_name(dev);
615+ if(!name)
616+@@ -855,16 +425,12 @@ NVProbe(DriverPtr drv, int flags)
617+ nvchips++;
618+ }
619+
620+- if(nvchips->name ||
621+- ((*ppPci)->vendor == PCI_VENDOR_NVIDIA &&
622+- (NVIsSupported(token) || NVIsG80((*ppPci)->chipType)))) {
623+- NVChipsets[numUsed].token = pciid;
624+- NVChipsets[numUsed].name = nvchips->name ? nvchips->name : "Unknown NVIDIA chip";
625+- NVPciChipsets[numUsed].numChipset = pciid;
626+- NVPciChipsets[numUsed].PCIid = pciid;
627+- NVPciChipsets[numUsed].resList = RES_SHARED_VGA;
628+- numUsed++;
629+- }
630++ NVChipsets[numUsed].token = pciid;
631++ NVChipsets[numUsed].name = nvchips->name ? nvchips->name : "Unknown NVIDIA chip";
632++ NVPciChipsets[numUsed].numChipset = pciid;
633++ NVPciChipsets[numUsed].PCIid = pciid;
634++ NVPciChipsets[numUsed].resList = RES_SHARED_VGA;
635++ numUsed++;
636+ }
637+ ppPci++;
638+ }
639+diff --git a/src/nvidia_chipset_gen.h b/src/nvidia_chipset_gen.h
640+new file mode 100644
641+index 0000000..e69de29
642+diff --git a/src/nvidia_pci_device_match_gen.h b/src/nvidia_pci_device_match_gen.h
643+new file mode 100644
644+index 0000000..e69de29
645+diff --git a/src/pcidb/nv_list.csv b/src/pcidb/nv_list.csv
646+new file mode 100644
647+index 0000000..06dd95d
648+--- /dev/null
649++++ b/src/pcidb/nv_list.csv
650+@@ -0,0 +1,638 @@
651++"#last updated 2009/05/15","","",""
652++"#vendor_id","device_id","special_case_data","Name"
653++"12D2","0018",," RIVA 128"
654++"10DE","0020",," RIVA TNT"
655++"10DE","0028",," RIVA TNT2"
656++"10DE","0029",," RIVA TNT2 Ultra"
657++"10DE","002A",," Unknown TNT2"
658++"10DE","002C",," Vanta"
659++"10DE","002D",," RIVA TNT2 Model 64"
660++"10DE","0040",," GeForce 6800 Ultra"
661++"10DE","0041",," GeForce 6800"
662++"10DE","0042",," GeForce 6800 LE"
663++"10DE","0043",," GeForce 6800 XE"
664++"10DE","0044",," GeForce 6800 XT"
665++"10DE","0045",," GeForce 6800 GT"
666++"10DE","0046",," GeForce 6800 GT"
667++"10DE","0047",," GeForce 6800 GS"
668++"10DE","0048",," GeForce 6800 XT"
669++"10DE","0049",,
670++"10DE","004A",,
671++"10DE","004B",,
672++"10DE","004C",,
673++"10DE","004D",,
674++"10DE","004E",," Quadro FX 4000"
675++"10DE","004F",,
676++"10DE","0090",," GeForce 7800 GTX"
677++"10DE","0091",," GeForce 7800 GTX"
678++"10DE","0092",," GeForce 7800 GT"
679++"10DE","0093",," GeForce 7800 GS"
680++"10DE","0094",,
681++"10DE","0095",," GeForce 7800 SLI"
682++"10DE","0096",,
683++"10DE","0097",,
684++"10DE","0098",," GeForce Go 7800"
685++"10DE","0099",," GeForce Go 7800 GTX"
686++"10DE","009A",,
687++"10DE","009B",,
688++"10DE","009C",,
689++"10DE","009D",," Quadro FX 4500"
690++"10DE","009E",,
691++"10DE","009F",,
692++"10DE","00A0",," Aladdin TNT2"
693++"10DE","00C0",," GeForce 6800 GS"
694++"10DE","00C1",," GeForce 6800"
695++"10DE","00C2",," GeForce 6800 LE"
696++"10DE","00C3",," GeForce 6800 XT"
697++"10DE","00C4",,
698++"10DE","00C5",,
699++"10DE","00C6",,
700++"10DE","00C7",,
701++"10DE","00C8",," GeForce Go 6800"
702++"10DE","00C9",," GeForce Go 6800 Ultra"
703++"10DE","00CA",,
704++"10DE","00CB",,
705++"10DE","00CC",," Quadro FX Go1400"
706++"10DE","00CD",," Quadro FX 3450/4000 SDI"
707++"10DE","00CE",," Quadro FX 1400"
708++"10DE","00CF",,
709++"10DE","0100",," GeForce 256"
710++"10DE","0101",," GeForce DDR"
711++"10DE","0103",," Quadro"
712++"10DE","0110",," GeForce2 MX/MX 400"
713++"10DE","0111",," GeForce2 MX 100/200"
714++"10DE","0112",," GeForce2 Go"
715++"10DE","0113",," Quadro2 MXR/EX/Go"
716++"10DE","0120",,
717++"10DE","0121",,
718++"10DE","0122",,
719++"10DE","0123",,
720++"10DE","0124",,
721++"10DE","0125",,
722++"10DE","0126",,
723++"10DE","0127",,
724++"10DE","0128",,
725++"10DE","0129",,
726++"10DE","012A",,
727++"10DE","012B",,
728++"10DE","012C",,
729++"10DE","012D",,
730++"10DE","012E",,
731++"10DE","012F",,
732++"10DE","0140",," GeForce 6600 GT"
733++"10DE","0141",," GeForce 6600"
734++"10DE","0142",," GeForce 6600 LE"
735++"10DE","0143",," GeForce 6600 VE"
736++"10DE","0144",," GeForce Go 6600"
737++"10DE","0145",," GeForce 6610 XL"
738++"10DE","0146",," GeForce Go 6600 TE/6200 TE"
739++"10DE","0147",," GeForce 6700 XL"
740++"10DE","0148",," GeForce Go 6600"
741++"10DE","0149",," GeForce Go 6600 GT"
742++"10DE","014A",," Quadro NVS 440"
743++"10DE","014B",,
744++"10DE","014C",," Quadro FX 550"
745++"10DE","014D",," Quadro FX 550"
746++"10DE","014E",," Quadro FX 540"
747++"10DE","014F",," GeForce 6200"
748++"10DE","0150",," GeForce2 GTS"
749++"10DE","0151",," GeForce2 Ti"
750++"10DE","0152",," GeForce2 Ultra"
751++"10DE","0153",," Quadro2 Pro"
752++"10DE","0160",," GeForce 6500"
753++"10DE","0161",," GeForce 6200 TurboCache(TM)"
754++"10DE","0162",," GeForce 6200SE TurboCache(TM)"
755++"10DE","0163",," GeForce 6200 LE"
756++"10DE","0164",," GeForce Go 6200"
757++"10DE","0165",," Quadro NVS 285"
758++"10DE","0166",," GeForce Go 6400"
759++"10DE","0167",," GeForce Go 6200"
760++"10DE","0168",," GeForce Go 6400"
761++"10DE","0169",," GeForce 6250"
762++"10DE","016A",," GeForce 7100 GS"
763++"10DE","016B",,
764++"10DE","016C",,
765++"10DE","016D",,
766++"10DE","016E",,
767++"10DE","016F",,
768++"10DE","0170",," GeForce4 MX 460"
769++"10DE","0171",," GeForce4 MX 440"
770++"10DE","0172",," GeForce4 MX 420"
771++"10DE","0173",," GeForce4 MX 440-SE"
772++"10DE","0174",," GeForce4 440 Go"
773++"10DE","0175",," GeForce4 420 Go"
774++"10DE","0176",," GeForce4 420 Go 32M"
775++"10DE","0177",," GeForce4 460 Go"
776++"10DE","0178",," Quadro4 550 XGL"
777++"10DE","0179","#if !defined(__powerpc__)"," GeForce4 440 Go 64M"
778++"10DE","0179","#if defined(__powerpc__)"," GeForce4 MX (Mac)"
779++"10DE","017A",," Quadro NVS"
780++"10DE","017B",,
781++"10DE","017C",," Quadro4 500 GoGL"
782++"10DE","017D",," GeForce4 410 Go 16M"
783++"10DE","017E",,
784++"10DE","017F",,
785++"10DE","0180",,
786++"10DE","0181",," GeForce4 MX 440 with AGP8X"
787++"10DE","0182",," GeForce4 MX 440SE with AGP8X"
788++"10DE","0183",," GeForce4 MX 420 with AGP8X"
789++"10DE","0184",,
790++"10DE","0185",," GeForce4 MX 4000"
791++"10DE","0186",," GeForce4 448 Go"
792++"10DE","0187",," GeForce4 488 Go"
793++"10DE","0188",," Quadro4 580 XGL"
794++"10DE","0189","#if defined(__powerpc__)"," GeForce4 MX with AGP8X (Mac)"
795++"10DE","018A",," Quadro4 NVS 280 SD"
796++"10DE","018B",," Quadro4 380 XGL"
797++"10DE","018C",," Quadro NVS 50 PCI"
798++"10DE","018D",," GeForce4 448 Go"
799++"10DE","018E",,
800++"10DE","018F",,
801++"10DE","0190",,
802++"10DE","0191",," GeForce 8800 GTX"
803++"10DE","0192",,
804++"10DE","0193",," GeForce 8800 GTS"
805++"10DE","0194",," GeForce 8800 Ultra"
806++"10DE","0194",,
807++"10DE","0195",,
808++"10DE","0196",,
809++"10DE","0197",,
810++"10DE","0198",,
811++"10DE","0199",,
812++"10DE","019A",,
813++"10DE","019B",,
814++"10DE","019C",,
815++"10DE","019D",," Quadro FX 5600"
816++"10DE","019D",,
817++"10DE","019E",,
818++"10DE","019E",," Quadro FX 4600"
819++"10DE","019F",,
820++"10DE","01A0",," GeForce2 Integrated GPU"
821++"10DE","01D0",," GeForce 7350 LE"
822++"10DE","01D1",," GeForce 7300 LE"
823++"10DE","01D2",,
824++"10DE","01D3",," GeForce 7300 SE"
825++"10DE","01D4",,
826++"10DE","01D5",,
827++"10DE","01D6",," GeForce Go 7200"
828++"10DE","01D7",," GeForce Go 7300"
829++"10DE","01D8",," GeForce Go 7400"
830++"10DE","01D9",," GeForce Go 7400 GS"
831++"10DE","01DA",," Quadro NVS 110M"
832++"10DE","01DB",," Quadro NVS 120M"
833++"10DE","01DC",," Quadro FX 350M"
834++"10DE","01DD",," GeForce 7500 LE"
835++"10DE","01DE",," Quadro FX 350"
836++"10DE","01DF",," GeForce 7300 GS"
837++"10DE","01F0",," GeForce4 MX Integrated GPU"
838++"10DE","0200",," GeForce3"
839++"10DE","0201",," GeForce3 Ti 200"
840++"10DE","0202",," GeForce3 Ti 500"
841++"10DE","0203",," Quadro DCC"
842++"10DE","0210",,
843++"10DE","0211",," GeForce 6800"
844++"10DE","0212",," GeForce 6800 LE"
845++"10DE","0213",,
846++"10DE","0214",,
847++"10DE","0215",," GeForce 6800 GT"
848++"10DE","0216",,
849++"10DE","0217",,
850++"10DE","0218",," GeForce 6800 XT"
851++"10DE","0219",,
852++"10DE","021A",,
853++"10DE","021B",,
854++"10DE","021C",,
855++"10DE","021D",,
856++"10DE","021E",,
857++"10DE","021F",,
858++"10DE","0220",,
859++"10DE","0221",," GeForce 6200"
860++"10DE","0222",," GeForce 6200 A-LE"
861++"10DE","0223",,
862++"10DE","0224",,
863++"10DE","0225",,
864++"10DE","0226",,
865++"10DE","0227",,
866++"10DE","0228",,
867++"10DE","0229",,
868++"10DE","022A",,
869++"10DE","022B",,
870++"10DE","022C",,
871++"10DE","022D",,
872++"10DE","022E",,
873++"10DE","022F",,
874++"10DE","0240",," GeForce 6150"
875++"10DE","0241",," GeForce 6150 LE"
876++"10DE","0242",," GeForce 6100"
877++"10DE","0243",,
878++"10DE","0244",," GeForce Go 6150"
879++"10DE","0245",," Quadro NVS 210S / NVIDIA GeForce 6150LE"
880++"10DE","0246",,
881++"10DE","0247",," GeForce Go 6100"
882++"10DE","0248",,
883++"10DE","0249",,
884++"10DE","024A",,
885++"10DE","024B",,
886++"10DE","024C",,
887++"10DE","024D",,
888++"10DE","024E",,
889++"10DE","024F",,
890++"10DE","0250",," GeForce4 Ti 4600"
891++"10DE","0251",," GeForce4 Ti 4400"
892++"10DE","0252",,
893++"10DE","0253",," GeForce4 Ti 4200"
894++"10DE","0254",,
895++"10DE","0255",,
896++"10DE","0256",,
897++"10DE","0257",,
898++"10DE","0258",," Quadro4 900 XGL"
899++"10DE","0259",," Quadro4 750 XGL"
900++"10DE","025A",,
901++"10DE","025B",," Quadro4 700 XGL"
902++"10DE","025C",,
903++"10DE","025D",,
904++"10DE","025E",,
905++"10DE","025F",,
906++"10DE","0280",," GeForce4 Ti 4800"
907++"10DE","0281",," GeForce4 Ti 4200 with AGP8X"
908++"10DE","0282",," GeForce4 Ti 4800 SE"
909++"10DE","0283",,
910++"10DE","0284",,
911++"10DE","0285",,
912++"10DE","0286",," GeForce4 4200 Go"
913++"10DE","0287",,
914++"10DE","0288",," Quadro4 980 XGL"
915++"10DE","0289",," Quadro4 780 XGL"
916++"10DE","028A",,
917++"10DE","028B",,
918++"10DE","028C",," Quadro4 700 GoGL"
919++"10DE","028D",,
920++"10DE","028E",,
921++"10DE","028F",,
922++"10DE","0290",," GeForce 7900 GTX"
923++"10DE","0291",," GeForce 7900 GT"
924++"10DE","0292",," GeForce 7900 GS"
925++"10DE","0293",," GeForce 7950 GX2"
926++"10DE","0294",," GeForce 7950 GX2"
927++"10DE","0295",," GeForce 7950 GT}"
928++"10DE","0296",,
929++"10DE","0297",," GeForce Go 7950 GTX"
930++"10DE","0298",," GeForce Go 7900 GS"
931++"10DE","0299",," GeForce Go 7900 GTX"
932++"10DE","029A",," Quadro FX 2500M"
933++"10DE","029B",," Quadro FX 1500M"
934++"10DE","029C",," Quadro FX 5500"
935++"10DE","029D",," Quadro FX 3500"
936++"10DE","029E",," Quadro FX 1500"
937++"10DE","029F",," Quadro FX 4500 X2"
938++"10DE","0300",,
939++"10DE","0301",," GeForce FX 5800 Ultra"
940++"10DE","0302",," GeForce FX 5800"
941++"10DE","0303",,
942++"10DE","0304",,
943++"10DE","0305",,
944++"10DE","0306",,
945++"10DE","0307",,
946++"10DE","0308",," Quadro FX 2000"
947++"10DE","0309",," Quadro FX 1000"
948++"10DE","030A",,
949++"10DE","030B",,
950++"10DE","030C",,
951++"10DE","030D",,
952++"10DE","030E",,
953++"10DE","030F",,
954++"10DE","0310",,
955++"10DE","0311",," GeForce FX 5600 Ultra"
956++"10DE","0312",," GeForce FX 5600"
957++"10DE","0313",,
958++"10DE","0314",," GeForce FX 560T"
959++"10DE","0315",,
960++"10DE","0316",,
961++"10DE","0317",,
962++"10DE","0318",,
963++"10DE","0319",,
964++"10DE","031A",," GeForce FX Go5600"
965++"10DE","031B",," GeForce FX Go5650"
966++"10DE","031C",," Quadro FX Go700"
967++"10DE","031D",,
968++"10DE","031E",,
969++"10DE","031F",,
970++"10DE","0320",," GeForce FX 5200"
971++"10DE","0321",," GeForce FX 5200 Ultra"
972++"10DE","0322",," GeForce FX 5200"
973++"10DE","0323",," GeForce FX 5200LE"
974++"10DE","0324",," GeForce FX Go5200"
975++"10DE","0325",," GeForce FX Go5250"
976++"10DE","0326",," GeForce FX 5500"
977++"10DE","0327",," GeForce FX 5100"
978++"10DE","0328",," GeForce FX Go5200 32M/64M"
979++"10DE","0329","#if defined(__powerpc__)"," GeForce FX 5200 (Mac)"
980++"10DE","032A",," Quadro NVS 55/280 PCI"
981++"10DE","032B",," Quadro FX 500/600 PCI"
982++"10DE","032C",," GeForce FX Go53xx Series"
983++"10DE","032D",," GeForce FX Go5100"
984++"10DE","032E",,
985++"10DE","032F",,
986++"10DE","0330",," GeForce FX 5900 Ultra"
987++"10DE","0331",," GeForce FX 5900"
988++"10DE","0332",," GeForce FX 590T"
989++"10DE","0333",," GeForce FX 5950 Ultra"
990++"10DE","0334",," GeForce FX 5900ZT"
991++"10DE","0335",,
992++"10DE","0336",,
993++"10DE","0337",,
994++"10DE","0338",," Quadro FX 3000"
995++"10DE","0339",,
996++"10DE","033A",,
997++"10DE","033B",,
998++"10DE","033C",,
999++"10DE","033D",,
1000++"10DE","033E",,
1001++"10DE","033F",," Quadro FX 700"
1002++"10DE","0340",,
1003++"10DE","0341",," GeForce FX 5700 Ultra"
1004++"10DE","0342",," GeForce FX 5700"
1005++"10DE","0343",," GeForce FX 5700LE"
1006++"10DE","0344",," GeForce FX 5700VE"
1007++"10DE","0345",,
1008++"10DE","0346",,
1009++"10DE","0347",," GeForce FX Go5700"
1010++"10DE","0348",," GeForce FX Go5700"
1011++"10DE","0349",,
1012++"10DE","034A",,
1013++"10DE","034B",,
1014++"10DE","034C",," Quadro FX Go1000"
1015++"10DE","034D",,
1016++"10DE","034E",," Quadro FX 1100"
1017++"10DE","034F",,
1018++"10DE","0390",," GeForce 7650 GS"
1019++"10DE","0391",," GeForce 7600 GT"
1020++"10DE","0392",," GeForce 7600 GS"
1021++"10DE","0393",," GeForce 7300 GT"
1022++"10DE","0394",," GeForce 7600 LE"
1023++"10DE","0395",," GeForce 7300 GT"
1024++"10DE","0396",,
1025++"10DE","0397",," GeForce Go 7700"
1026++"10DE","0398",," GeForce Go 7600"
1027++"10DE","0399",," GeForce Go 7600 GT}"
1028++"10DE","039A",," Quadro NVS 300M"
1029++"10DE","039B",," GeForce Go 7900 SE"
1030++"10DE","039C",," Quadro FX 550M"
1031++"10DE","039D",,
1032++"10DE","039E",," Quadro FX 560"
1033++"10DE","039F",,
1034++"10DE","03D0",," GeForce 6150SE"
1035++"10DE","03D1",," GeForce 6100 nForce 405"
1036++"10DE","03D2",," GeForce 6100 nForce 400"
1037++"10DE","03D3",,
1038++"10DE","03D4",,
1039++"10DE","03D5",," GeForce 6100 nForce 420"
1040++"10DE","03D6",,
1041++"10DE","03D7",,
1042++"10DE","03D8",,
1043++"10DE","03D9",,
1044++"10DE","03DA",,
1045++"10DE","03DB",,
1046++"10DE","03DC",,
1047++"10DE","03DD",,
1048++"10DE","03DE",,
1049++"10DE","03DF",,
1050++"10DE","0400",," GeForce 8600 GTS"
1051++"10DE","0401",," GeForce 8600 GT"
1052++"10DE","0402",," GeForce 8600 GT"
1053++"10DE","0403",," GeForce 8600 GS"
1054++"10DE","0404",," GeForce 8400 GS"
1055++"10DE","0405",," GeForce 9500M GS"
1056++"10DE","0406",,
1057++"10DE","0407",," GeForce 8600M GT"
1058++"10DE","0408",," GeForce 9650M GS"
1059++"10DE","0409",," GeForce 8700M GT"
1060++"10DE","040A",," Quadro FX 370"
1061++"10DE","040B",," Quadro NVS 320M"
1062++"10DE","040C",," Quadro FX 570M"
1063++"10DE","040D",," Quadro FX 1600M"
1064++"10DE","040E",," Quadro FX 570"
1065++"10DE","040F",," Quadro FX 1700"
1066++"10DE","0420",," GeForce 8400 SE"
1067++"10DE","0421",," GeForce 8500 GT"
1068++"10DE","0422",," GeForce 8400 GS"
1069++"10DE","0423",," GeForce 8300 GS"
1070++"10DE","0424",," GeForce 8400 GS"
1071++"10DE","0425",," GeForce 8600M GS"
1072++"10DE","0426",," GeForce 8400M GT"
1073++"10DE","0427",," GeForce 8400M GS"
1074++"10DE","0428",," GeForce 8400M G"
1075++"10DE","0429",," Quadro NVS 140M"
1076++"10DE","042A",," Quadro NVS 130M"
1077++"10DE","042B",," Quadro NVS 135M"
1078++"10DE","042C",," GeForce 9400 GT"
1079++"10DE","042D",," Quadro FX 360M"
1080++"10DE","042E",," GeForce 9300M G"
1081++"10DE","042F",," Quadro NVS 290"
1082++"10DE","05E0",," GeForce GTX 295"
1083++"10DE","05E1",," GeForce GTX 280"
1084++"10DE","05E2",," GeForce GTX 260"
1085++"10DE","05E3",," GeForce GTX 285"
1086++"10DE","05E4",,
1087++"10DE","05E5",,
1088++"10DE","05E6",,
1089++"10DE","05E7",,
1090++"10DE","05E8",,
1091++"10DE","05E9",,
1092++"10DE","05EA",,
1093++"10DE","05EB",,
1094++"10DE","05EC",,
1095++"10DE","05ED",,
1096++"10DE","05EE",,
1097++"10DE","05EF",,
1098++"10DE","05F0",,
1099++"10DE","05F1",,
1100++"10DE","05F2",,
1101++"10DE","05F3",,
1102++"10DE","05F4",,
1103++"10DE","05F5",,
1104++"10DE","05F6",,
1105++"10DE","05F7",,
1106++"10DE","05F8",,
1107++"10DE","05F9",," Quadro CX"
1108++"10DE","05FA",,
1109++"10DE","05FB",,
1110++"10DE","05FC",,
1111++"10DE","05FD",," Quadro FX 5800"
1112++"10DE","05FE",," Quadro FX 4800"
1113++"10DE","05FF",," Quadro FX 3800"
1114++"10DE","0600",," GeForce 8800 GTS 512"
1115++"10DE","0601",," GeForce 9800 GT"
1116++"10DE","0602",," GeForce 8800 GT"
1117++"10DE","0603",,
1118++"10DE","0604",," GeForce 9800 GX2"
1119++"10DE","0605",," GeForce 9800 GT"
1120++"10DE","0606",," GeForce 8800 GS"
1121++"10DE","0607",,
1122++"10DE","0608",," GeForce 9800M GTX"
1123++"10DE","0609",," GeForce 8800M GTS"
1124++"10DE","060A",,
1125++"10DE","060B",," GeForce 9800M GT"
1126++"10DE","060C",," GeForce 8800M GTX"
1127++"10DE","060D",," GeForce 8800 GS"
1128++"10DE","060E",,
1129++"10DE","060F",,
1130++"10DE","0610",," GeForce 9600 GSO"
1131++"10DE","0611",," GeForce 8800 GT"
1132++"10DE","0612",," GeForce 9800 GTX"
1133++"10DE","0613",," GeForce 9800 GTX+"
1134++"10DE","0614",," GeForce 9800 GT"
1135++"10DE","0615",," GeForce GTS 250"
1136++"10DE","0617",," GeForce 9800M GTX"
1137++"10DE","0618",,
1138++"10DE","0619",,
1139++"10DE","061A",," Quadro FX 3700"
1140++"10DE","061B",,
1141++"10DE","061C",," Quadro FX 3600M"
1142++"10DE","061D",,
1143++"10DE","061E",," Quadro FX 3700M"
1144++"10DE","061F",,
1145++"10DE","0620",,
1146++"10DE","0621",,
1147++"10DE","0622",," GeForce 9600 GT"
1148++"10DE","0623",," GeForce 9600 GS"
1149++"10DE","0624",,
1150++"10DE","0625",," GeForce 9600 GSO 512"
1151++"10DE","0626",," GeForce GT 130"
1152++"10DE","0627",," GeForce GT 140"
1153++"10DE","0628",," GeForce 9800M GTS"
1154++"10DE","0629",,
1155++"10DE","062A",," GeForce 9700M GTS"
1156++"10DE","062B",," GeForce 9800M GS"
1157++"10DE","062C",," GeForce 9800M GTS"
1158++"10DE","062D",,
1159++"10DE","062E",,
1160++"10DE","062F",,
1161++"10DE","0630",,
1162++"10DE","0631",,
1163++"10DE","0632",,
1164++"10DE","0633",,
1165++"10DE","0634",,
1166++"10DE","0635",,
1167++"10DE","0636",,
1168++"10DE","0637",,
1169++"10DE","0638",," Quadro FX 1800"
1170++"10DE","0639",,
1171++"10DE","063A",," Quadro FX 2700M"
1172++"10DE","063B",,
1173++"10DE","063C",,
1174++"10DE","063D",,
1175++"10DE","063E",,
1176++"10DE","063F",,
1177++"10DE","0640",," GeForce 9500 GT"
1178++"10DE","0641",," GeForce 9400 GT"
1179++"10DE","0642",,
1180++"10DE","0643",," GeForce 9500 GT"
1181++"10DE","0644",,
1182++"10DE","0645",,
1183++"10DE","0646",," GeForce GT 120"
1184++"10DE","0647",," GeForce 9600M GT"
1185++"10DE","0648",," GeForce 9600M GS"
1186++"10DE","0649",," GeForce 9600M GT"
1187++"10DE","064A",," GeForce 9700M GT"
1188++"10DE","064B",," GeForce 9500M G"
1189++"10DE","064C",," GeForce 9650M GT"
1190++"10DE","064D",,
1191++"10DE","064E",,
1192++"10DE","064F",,
1193++"10DE","0650",,
1194++"10DE","0651",,
1195++"10DE","0652",,
1196++"10DE","0653",,
1197++"10DE","0654",,
1198++"10DE","0655",,
1199++"10DE","0656",," GeForce 9500 GT"
1200++"10DE","0657",,
1201++"10DE","0658",," Quadro FX 380"
1202++"10DE","0659",," Quadro FX 580"
1203++"10DE","065A",,
1204++"10DE","065B",,
1205++"10DE","065C",," Quadro FX 770M"
1206++"10DE","065D",,
1207++"10DE","065E",,
1208++"10DE","065F",,
1209++"10DE","06E0",," GeForce 9300 GE"
1210++"10DE","06E1",," GeForce 9300 GS"
1211++"10DE","06E2",,
1212++"10DE","06E3",,
1213++"10DE","06E4",," GeForce 8400 GS"
1214++"10DE","06E5",," GeForce 9300M GS"
1215++"10DE","06E6",," GeForce G100"
1216++"10DE","06E7",,
1217++"10DE","06E8",," GeForce 9200M GS"
1218++"10DE","06E9",," GeForce 9300M GS"
1219++"10DE","06EA",," Quadro NVS 150M"
1220++"10DE","06EB",," Quadro NVS 160M"
1221++"10DE","06EC",,
1222++"10DE","06ED",,
1223++"10DE","06EE",,
1224++"10DE","06EF",,
1225++"10DE","06F0",,
1226++"10DE","06F1",,
1227++"10DE","06F2",,
1228++"10DE","06F3",,
1229++"10DE","06F4",,
1230++"10DE","06F5",,
1231++"10DE","06F6",,
1232++"10DE","06F7",,
1233++"10DE","06F8",," Quadro NVS 420"
1234++"10DE","06F9",," Quadro FX 370 LP"
1235++"10DE","06FA",," Quadro NVS 450"
1236++"10DE","06FB",,
1237++"10DE","06FC",,
1238++"10DE","06FD",," Quadro NVS 295"
1239++"10DE","06FE",,
1240++"10DE","06FF",,
1241++"10DE","0A60",,
1242++"10DE","0A61",,
1243++"10DE","0A62",,
1244++"10DE","0A63",,
1245++"10DE","0A64",,
1246++"10DE","0A65",,
1247++"10DE","0A66",,
1248++"10DE","0A67",,
1249++"10DE","0A68",,
1250++"10DE","0A69",,
1251++"10DE","0A6A",,
1252++"10DE","0A6B",,
1253++"10DE","0A6C",,
1254++"10DE","0A6D",,
1255++"10DE","0A6E",,
1256++"10DE","0A6F",,
1257++"10DE","0A70",,
1258++"10DE","0A71",,
1259++"10DE","0A72",,
1260++"10DE","0A73",,
1261++"10DE","0A74",,
1262++"10DE","0A75",,
1263++"10DE","0A76",,
1264++"10DE","0A77",,
1265++"10DE","0A78",,
1266++"10DE","0A79",,
1267++"10DE","0A7A",,
1268++"10DE","0A7B",,
1269++"10DE","0A7C",,
1270++"10DE","0A7D",,
1271++"10DE","0A7E",,
1272++"10DE","0A7F",,
1273++"10DE","0CA0",,
1274++"10DE","0CA1",,
1275++"10DE","0CA2",,
1276++"10DE","0CA3",,
1277++"10DE","0CA4",,
1278++"10DE","0CA5",,
1279++"10DE","0CA6",,
1280++"10DE","0CA7",,
1281++"10DE","0CA8",,
1282++"10DE","0CA9",,
1283++"10DE","0CAA",,
1284++"10DE","0CAB",,
1285++"10DE","0CAC",,
1286++"10DE","0CAD",,
1287++"10DE","0CAE",,
1288++"10DE","0CAF",,
1289+diff --git a/src/pcidb/parse_pci_ids.pl b/src/pcidb/parse_pci_ids.pl
1290+new file mode 100755
1291+index 0000000..4afe4f2
1292+--- /dev/null
1293++++ b/src/pcidb/parse_pci_ids.pl
1294+@@ -0,0 +1,82 @@
1295++#!/usr/bin/perl
1296++#
1297++# Copyright 2007 Red Hat Inc.
1298++# This crappy script written by Dave Airlie to avoid hassle of adding
1299++# ids in every place.
1300++#
1301++# Modified by Mario Limonciello <Mario_Limonciello@Dell.com> to handle nv
1302++#
1303++use strict;
1304++use warnings;
1305++use Text::CSV_XS;
1306++
1307++my $file = $ARGV[0];
1308++
1309++my $nvidiapcidevicematchfile = 'nvidia_pci_device_match_gen.h';
1310++my $nvidiachipsetfile = 'nvidia_chipset_gen.h';
1311++
1312++my $csv = Text::CSV_XS->new();
1313++
1314++open (CSV, "<", $file) or die $!;
1315++
1316++open (PCIDEVICEMATCH, ">", $nvidiapcidevicematchfile) or die;
1317++open (NVIDIACHIPSET, ">", $nvidiachipsetfile) or die;
1318++
1319++print NVIDIACHIPSET "/* This file is autogenerated please do not edit */\n";
1320++print NVIDIACHIPSET "static SymTabRec NVKnownChipsets[] = {\n";
1321++
1322++print PCIDEVICEMATCH "/* This file is autogenerated please do not edit */\n";
1323++
1324++print PCIDEVICEMATCH "#if XSERVER_LIBPCIACCESS\n";
1325++print PCIDEVICEMATCH "#define LIBPCIACCESS_CLASS_SHIFT (PCI_CLASS_SHIFT - 8)\n";
1326++print PCIDEVICEMATCH "#define LIBPCIACCESS_CLASS_MASK (PCI_CLASS_MASK >> 8)\n";
1327++
1328++print PCIDEVICEMATCH "#define NVIDIA_DEVICE_MATCH(v, d, i) \\\n";
1329++print PCIDEVICEMATCH " { (v), (d), PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_CLASS_DISPLAY << LIBPCIACCESS_CLASS_SHIFT, LIBPCIACCESS_CLASS_MASK, (i) }\n";
1330++
1331++print PCIDEVICEMATCH "static const struct pci_id_match NVPciIdMatchList[] = {\n";
1332++
1333++while (<CSV>) {
1334++ if ($csv->parse($_)) {
1335++ my @columns = $csv->fields();
1336++
1337++ if ((substr($columns[0], 0, 1) ne "#")) {
1338++
1339++ #for special case
1340++ if ($columns[2] ne "") {
1341++ print NVIDIACHIPSET "$columns[2]\n";
1342++ print PCIDEVICEMATCH "$columns[2]\n";
1343++ }
1344++
1345++ if ($columns[0] eq "12D2") {
1346++ print PCIDEVICEMATCH " NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA_SGS, 0x$columns[1], 0 ),\n";
1347++ }
1348++
1349++ if ($columns[0] eq "10DE") {
1350++ print PCIDEVICEMATCH " NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x$columns[1], 0 ),\n";
1351++ }
1352++
1353++ if ($columns[3] ne "") {
1354++ print NVIDIACHIPSET " { 0x$columns[0]$columns[1], \"$columns[3]\" },\n";
1355++ }
1356++
1357++ #for special case
1358++ if ($columns[2] ne "") {
1359++ print NVIDIACHIPSET "#endif\n";
1360++ print PCIDEVICEMATCH "#endif\n";
1361++ }
1362++
1363++
1364++ }
1365++ } else {
1366++ my $err = $csv->error_input;
1367++ print "Failed to parse line: $err";
1368++ }
1369++}
1370++
1371++print NVIDIACHIPSET " { -1, NULL }\n};\n";
1372++print PCIDEVICEMATCH " { 0, 0, 0 }\n};\n";
1373++print PCIDEVICEMATCH "#endif\n";
1374++close CSV;
1375++close PCIDEVICEMATCH;
1376++close NVIDIACHIPSET;
1377+--
1378+1.6.0.4
1379+
1380
1381=== added file 'debian/patches/0002-Run-the-parsing-script-to-generate-an-initial-list-o.patch'
1382--- debian/patches/0002-Run-the-parsing-script-to-generate-an-initial-list-o.patch 1970-01-01 00:00:00 +0000
1383+++ debian/patches/0002-Run-the-parsing-script-to-generate-an-initial-list-o.patch 2010-06-08 09:18:27 +0000
1384@@ -0,0 +1,1007 @@
1385+From bf594e812dfe573a3331eb3d95e36d7accbcab0a Mon Sep 17 00:00:00 2001
1386+From: Mario Limonciello <mario_limonciello@dell.com>
1387+Date: Sat, 12 Sep 2009 09:13:02 -0500
1388+Subject: [PATCH] Run the parsing script to generate an initial list of devices.
1389+
1390+In the future, run this script from the "src" directory like this:
1391+./pcidb/parse_pci_ids.pl ./pcidb/nv_list.csv
1392+---
1393+ src/nvidia_chipset_gen.h | 328 +++++++++++++++++++
1394+ src/nvidia_pci_device_match_gen.h | 654 +++++++++++++++++++++++++++++++++++++
1395+ 2 files changed, 982 insertions(+), 0 deletions(-)
1396+
1397+diff --git a/src/nvidia_chipset_gen.h b/src/nvidia_chipset_gen.h
1398+index e69de29..6b73019 100644
1399+--- a/src/nvidia_chipset_gen.h
1400++++ b/src/nvidia_chipset_gen.h
1401+@@ -0,0 +1,328 @@
1402++/* This file is autogenerated please do not edit */
1403++static SymTabRec NVKnownChipsets[] = {
1404++ { 0x12D20018, " RIVA 128" },
1405++ { 0x10DE0020, " RIVA TNT" },
1406++ { 0x10DE0028, " RIVA TNT2" },
1407++ { 0x10DE0029, " RIVA TNT2 Ultra" },
1408++ { 0x10DE002A, " Unknown TNT2" },
1409++ { 0x10DE002C, " Vanta" },
1410++ { 0x10DE002D, " RIVA TNT2 Model 64" },
1411++ { 0x10DE0040, " GeForce 6800 Ultra" },
1412++ { 0x10DE0041, " GeForce 6800" },
1413++ { 0x10DE0042, " GeForce 6800 LE" },
1414++ { 0x10DE0043, " GeForce 6800 XE" },
1415++ { 0x10DE0044, " GeForce 6800 XT" },
1416++ { 0x10DE0045, " GeForce 6800 GT" },
1417++ { 0x10DE0046, " GeForce 6800 GT" },
1418++ { 0x10DE0047, " GeForce 6800 GS" },
1419++ { 0x10DE0048, " GeForce 6800 XT" },
1420++ { 0x10DE004E, " Quadro FX 4000" },
1421++ { 0x10DE0090, " GeForce 7800 GTX" },
1422++ { 0x10DE0091, " GeForce 7800 GTX" },
1423++ { 0x10DE0092, " GeForce 7800 GT" },
1424++ { 0x10DE0093, " GeForce 7800 GS" },
1425++ { 0x10DE0095, " GeForce 7800 SLI" },
1426++ { 0x10DE0098, " GeForce Go 7800" },
1427++ { 0x10DE0099, " GeForce Go 7800 GTX" },
1428++ { 0x10DE009D, " Quadro FX 4500" },
1429++ { 0x10DE00A0, " Aladdin TNT2" },
1430++ { 0x10DE00C0, " GeForce 6800 GS" },
1431++ { 0x10DE00C1, " GeForce 6800" },
1432++ { 0x10DE00C2, " GeForce 6800 LE" },
1433++ { 0x10DE00C3, " GeForce 6800 XT" },
1434++ { 0x10DE00C8, " GeForce Go 6800" },
1435++ { 0x10DE00C9, " GeForce Go 6800 Ultra" },
1436++ { 0x10DE00CC, " Quadro FX Go1400" },
1437++ { 0x10DE00CD, " Quadro FX 3450/4000 SDI" },
1438++ { 0x10DE00CE, " Quadro FX 1400" },
1439++ { 0x10DE0100, " GeForce 256" },
1440++ { 0x10DE0101, " GeForce DDR" },
1441++ { 0x10DE0103, " Quadro" },
1442++ { 0x10DE0110, " GeForce2 MX/MX 400" },
1443++ { 0x10DE0111, " GeForce2 MX 100/200" },
1444++ { 0x10DE0112, " GeForce2 Go" },
1445++ { 0x10DE0113, " Quadro2 MXR/EX/Go" },
1446++ { 0x10DE0140, " GeForce 6600 GT" },
1447++ { 0x10DE0141, " GeForce 6600" },
1448++ { 0x10DE0142, " GeForce 6600 LE" },
1449++ { 0x10DE0143, " GeForce 6600 VE" },
1450++ { 0x10DE0144, " GeForce Go 6600" },
1451++ { 0x10DE0145, " GeForce 6610 XL" },
1452++ { 0x10DE0146, " GeForce Go 6600 TE/6200 TE" },
1453++ { 0x10DE0147, " GeForce 6700 XL" },
1454++ { 0x10DE0148, " GeForce Go 6600" },
1455++ { 0x10DE0149, " GeForce Go 6600 GT" },
1456++ { 0x10DE014A, " Quadro NVS 440" },
1457++ { 0x10DE014C, " Quadro FX 550" },
1458++ { 0x10DE014D, " Quadro FX 550" },
1459++ { 0x10DE014E, " Quadro FX 540" },
1460++ { 0x10DE014F, " GeForce 6200" },
1461++ { 0x10DE0150, " GeForce2 GTS" },
1462++ { 0x10DE0151, " GeForce2 Ti" },
1463++ { 0x10DE0152, " GeForce2 Ultra" },
1464++ { 0x10DE0153, " Quadro2 Pro" },
1465++ { 0x10DE0160, " GeForce 6500" },
1466++ { 0x10DE0161, " GeForce 6200 TurboCache(TM)" },
1467++ { 0x10DE0162, " GeForce 6200SE TurboCache(TM)" },
1468++ { 0x10DE0163, " GeForce 6200 LE" },
1469++ { 0x10DE0164, " GeForce Go 6200" },
1470++ { 0x10DE0165, " Quadro NVS 285" },
1471++ { 0x10DE0166, " GeForce Go 6400" },
1472++ { 0x10DE0167, " GeForce Go 6200" },
1473++ { 0x10DE0168, " GeForce Go 6400" },
1474++ { 0x10DE0169, " GeForce 6250" },
1475++ { 0x10DE016A, " GeForce 7100 GS" },
1476++ { 0x10DE0170, " GeForce4 MX 460" },
1477++ { 0x10DE0171, " GeForce4 MX 440" },
1478++ { 0x10DE0172, " GeForce4 MX 420" },
1479++ { 0x10DE0173, " GeForce4 MX 440-SE" },
1480++ { 0x10DE0174, " GeForce4 440 Go" },
1481++ { 0x10DE0175, " GeForce4 420 Go" },
1482++ { 0x10DE0176, " GeForce4 420 Go 32M" },
1483++ { 0x10DE0177, " GeForce4 460 Go" },
1484++ { 0x10DE0178, " Quadro4 550 XGL" },
1485++#if !defined(__powerpc__)
1486++ { 0x10DE0179, " GeForce4 440 Go 64M" },
1487++#endif
1488++#if defined(__powerpc__)
1489++ { 0x10DE0179, " GeForce4 MX (Mac)" },
1490++#endif
1491++ { 0x10DE017A, " Quadro NVS" },
1492++ { 0x10DE017C, " Quadro4 500 GoGL" },
1493++ { 0x10DE017D, " GeForce4 410 Go 16M" },
1494++ { 0x10DE0181, " GeForce4 MX 440 with AGP8X" },
1495++ { 0x10DE0182, " GeForce4 MX 440SE with AGP8X" },
1496++ { 0x10DE0183, " GeForce4 MX 420 with AGP8X" },
1497++ { 0x10DE0185, " GeForce4 MX 4000" },
1498++ { 0x10DE0186, " GeForce4 448 Go" },
1499++ { 0x10DE0187, " GeForce4 488 Go" },
1500++ { 0x10DE0188, " Quadro4 580 XGL" },
1501++#if defined(__powerpc__)
1502++ { 0x10DE0189, " GeForce4 MX with AGP8X (Mac)" },
1503++#endif
1504++ { 0x10DE018A, " Quadro4 NVS 280 SD" },
1505++ { 0x10DE018B, " Quadro4 380 XGL" },
1506++ { 0x10DE018C, " Quadro NVS 50 PCI" },
1507++ { 0x10DE018D, " GeForce4 448 Go" },
1508++ { 0x10DE0191, " GeForce 8800 GTX" },
1509++ { 0x10DE0193, " GeForce 8800 GTS" },
1510++ { 0x10DE0194, " GeForce 8800 Ultra" },
1511++ { 0x10DE019D, " Quadro FX 5600" },
1512++ { 0x10DE019E, " Quadro FX 4600" },
1513++ { 0x10DE01A0, " GeForce2 Integrated GPU" },
1514++ { 0x10DE01D0, " GeForce 7350 LE" },
1515++ { 0x10DE01D1, " GeForce 7300 LE" },
1516++ { 0x10DE01D3, " GeForce 7300 SE" },
1517++ { 0x10DE01D6, " GeForce Go 7200" },
1518++ { 0x10DE01D7, " GeForce Go 7300" },
1519++ { 0x10DE01D8, " GeForce Go 7400" },
1520++ { 0x10DE01D9, " GeForce Go 7400 GS" },
1521++ { 0x10DE01DA, " Quadro NVS 110M" },
1522++ { 0x10DE01DB, " Quadro NVS 120M" },
1523++ { 0x10DE01DC, " Quadro FX 350M" },
1524++ { 0x10DE01DD, " GeForce 7500 LE" },
1525++ { 0x10DE01DE, " Quadro FX 350" },
1526++ { 0x10DE01DF, " GeForce 7300 GS" },
1527++ { 0x10DE01F0, " GeForce4 MX Integrated GPU" },
1528++ { 0x10DE0200, " GeForce3" },
1529++ { 0x10DE0201, " GeForce3 Ti 200" },
1530++ { 0x10DE0202, " GeForce3 Ti 500" },
1531++ { 0x10DE0203, " Quadro DCC" },
1532++ { 0x10DE0211, " GeForce 6800" },
1533++ { 0x10DE0212, " GeForce 6800 LE" },
1534++ { 0x10DE0215, " GeForce 6800 GT" },
1535++ { 0x10DE0218, " GeForce 6800 XT" },
1536++ { 0x10DE0221, " GeForce 6200" },
1537++ { 0x10DE0222, " GeForce 6200 A-LE" },
1538++ { 0x10DE0240, " GeForce 6150" },
1539++ { 0x10DE0241, " GeForce 6150 LE" },
1540++ { 0x10DE0242, " GeForce 6100" },
1541++ { 0x10DE0244, " GeForce Go 6150" },
1542++ { 0x10DE0245, " Quadro NVS 210S / NVIDIA GeForce 6150LE" },
1543++ { 0x10DE0247, " GeForce Go 6100" },
1544++ { 0x10DE0250, " GeForce4 Ti 4600" },
1545++ { 0x10DE0251, " GeForce4 Ti 4400" },
1546++ { 0x10DE0253, " GeForce4 Ti 4200" },
1547++ { 0x10DE0258, " Quadro4 900 XGL" },
1548++ { 0x10DE0259, " Quadro4 750 XGL" },
1549++ { 0x10DE025B, " Quadro4 700 XGL" },
1550++ { 0x10DE0280, " GeForce4 Ti 4800" },
1551++ { 0x10DE0281, " GeForce4 Ti 4200 with AGP8X" },
1552++ { 0x10DE0282, " GeForce4 Ti 4800 SE" },
1553++ { 0x10DE0286, " GeForce4 4200 Go" },
1554++ { 0x10DE0288, " Quadro4 980 XGL" },
1555++ { 0x10DE0289, " Quadro4 780 XGL" },
1556++ { 0x10DE028C, " Quadro4 700 GoGL" },
1557++ { 0x10DE0290, " GeForce 7900 GTX" },
1558++ { 0x10DE0291, " GeForce 7900 GT" },
1559++ { 0x10DE0292, " GeForce 7900 GS" },
1560++ { 0x10DE0293, " GeForce 7950 GX2" },
1561++ { 0x10DE0294, " GeForce 7950 GX2" },
1562++ { 0x10DE0295, " GeForce 7950 GT}" },
1563++ { 0x10DE0297, " GeForce Go 7950 GTX" },
1564++ { 0x10DE0298, " GeForce Go 7900 GS" },
1565++ { 0x10DE0299, " GeForce Go 7900 GTX" },
1566++ { 0x10DE029A, " Quadro FX 2500M" },
1567++ { 0x10DE029B, " Quadro FX 1500M" },
1568++ { 0x10DE029C, " Quadro FX 5500" },
1569++ { 0x10DE029D, " Quadro FX 3500" },
1570++ { 0x10DE029E, " Quadro FX 1500" },
1571++ { 0x10DE029F, " Quadro FX 4500 X2" },
1572++ { 0x10DE0301, " GeForce FX 5800 Ultra" },
1573++ { 0x10DE0302, " GeForce FX 5800" },
1574++ { 0x10DE0308, " Quadro FX 2000" },
1575++ { 0x10DE0309, " Quadro FX 1000" },
1576++ { 0x10DE0311, " GeForce FX 5600 Ultra" },
1577++ { 0x10DE0312, " GeForce FX 5600" },
1578++ { 0x10DE0314, " GeForce FX 560T" },
1579++ { 0x10DE031A, " GeForce FX Go5600" },
1580++ { 0x10DE031B, " GeForce FX Go5650" },
1581++ { 0x10DE031C, " Quadro FX Go700" },
1582++ { 0x10DE0320, " GeForce FX 5200" },
1583++ { 0x10DE0321, " GeForce FX 5200 Ultra" },
1584++ { 0x10DE0322, " GeForce FX 5200" },
1585++ { 0x10DE0323, " GeForce FX 5200LE" },
1586++ { 0x10DE0324, " GeForce FX Go5200" },
1587++ { 0x10DE0325, " GeForce FX Go5250" },
1588++ { 0x10DE0326, " GeForce FX 5500" },
1589++ { 0x10DE0327, " GeForce FX 5100" },
1590++ { 0x10DE0328, " GeForce FX Go5200 32M/64M" },
1591++#if defined(__powerpc__)
1592++ { 0x10DE0329, " GeForce FX 5200 (Mac)" },
1593++#endif
1594++ { 0x10DE032A, " Quadro NVS 55/280 PCI" },
1595++ { 0x10DE032B, " Quadro FX 500/600 PCI" },
1596++ { 0x10DE032C, " GeForce FX Go53xx Series" },
1597++ { 0x10DE032D, " GeForce FX Go5100" },
1598++ { 0x10DE0330, " GeForce FX 5900 Ultra" },
1599++ { 0x10DE0331, " GeForce FX 5900" },
1600++ { 0x10DE0332, " GeForce FX 590T" },
1601++ { 0x10DE0333, " GeForce FX 5950 Ultra" },
1602++ { 0x10DE0334, " GeForce FX 5900ZT" },
1603++ { 0x10DE0338, " Quadro FX 3000" },
1604++ { 0x10DE033F, " Quadro FX 700" },
1605++ { 0x10DE0341, " GeForce FX 5700 Ultra" },
1606++ { 0x10DE0342, " GeForce FX 5700" },
1607++ { 0x10DE0343, " GeForce FX 5700LE" },
1608++ { 0x10DE0344, " GeForce FX 5700VE" },
1609++ { 0x10DE0347, " GeForce FX Go5700" },
1610++ { 0x10DE0348, " GeForce FX Go5700" },
1611++ { 0x10DE034C, " Quadro FX Go1000" },
1612++ { 0x10DE034E, " Quadro FX 1100" },
1613++ { 0x10DE0390, " GeForce 7650 GS" },
1614++ { 0x10DE0391, " GeForce 7600 GT" },
1615++ { 0x10DE0392, " GeForce 7600 GS" },
1616++ { 0x10DE0393, " GeForce 7300 GT" },
1617++ { 0x10DE0394, " GeForce 7600 LE" },
1618++ { 0x10DE0395, " GeForce 7300 GT" },
1619++ { 0x10DE0397, " GeForce Go 7700" },
1620++ { 0x10DE0398, " GeForce Go 7600" },
1621++ { 0x10DE0399, " GeForce Go 7600 GT}" },
1622++ { 0x10DE039A, " Quadro NVS 300M" },
1623++ { 0x10DE039B, " GeForce Go 7900 SE" },
1624++ { 0x10DE039C, " Quadro FX 550M" },
1625++ { 0x10DE039E, " Quadro FX 560" },
1626++ { 0x10DE03D0, " GeForce 6150SE" },
1627++ { 0x10DE03D1, " GeForce 6100 nForce 405" },
1628++ { 0x10DE03D2, " GeForce 6100 nForce 400" },
1629++ { 0x10DE03D5, " GeForce 6100 nForce 420" },
1630++ { 0x10DE0400, " GeForce 8600 GTS" },
1631++ { 0x10DE0401, " GeForce 8600 GT" },
1632++ { 0x10DE0402, " GeForce 8600 GT" },
1633++ { 0x10DE0403, " GeForce 8600 GS" },
1634++ { 0x10DE0404, " GeForce 8400 GS" },
1635++ { 0x10DE0405, " GeForce 9500M GS" },
1636++ { 0x10DE0407, " GeForce 8600M GT" },
1637++ { 0x10DE0408, " GeForce 9650M GS" },
1638++ { 0x10DE0409, " GeForce 8700M GT" },
1639++ { 0x10DE040A, " Quadro FX 370" },
1640++ { 0x10DE040B, " Quadro NVS 320M" },
1641++ { 0x10DE040C, " Quadro FX 570M" },
1642++ { 0x10DE040D, " Quadro FX 1600M" },
1643++ { 0x10DE040E, " Quadro FX 570" },
1644++ { 0x10DE040F, " Quadro FX 1700" },
1645++ { 0x10DE0420, " GeForce 8400 SE" },
1646++ { 0x10DE0421, " GeForce 8500 GT" },
1647++ { 0x10DE0422, " GeForce 8400 GS" },
1648++ { 0x10DE0423, " GeForce 8300 GS" },
1649++ { 0x10DE0424, " GeForce 8400 GS" },
1650++ { 0x10DE0425, " GeForce 8600M GS" },
1651++ { 0x10DE0426, " GeForce 8400M GT" },
1652++ { 0x10DE0427, " GeForce 8400M GS" },
1653++ { 0x10DE0428, " GeForce 8400M G" },
1654++ { 0x10DE0429, " Quadro NVS 140M" },
1655++ { 0x10DE042A, " Quadro NVS 130M" },
1656++ { 0x10DE042B, " Quadro NVS 135M" },
1657++ { 0x10DE042C, " GeForce 9400 GT" },
1658++ { 0x10DE042D, " Quadro FX 360M" },
1659++ { 0x10DE042E, " GeForce 9300M G" },
1660++ { 0x10DE042F, " Quadro NVS 290" },
1661++ { 0x10DE05E0, " GeForce GTX 295" },
1662++ { 0x10DE05E1, " GeForce GTX 280" },
1663++ { 0x10DE05E2, " GeForce GTX 260" },
1664++ { 0x10DE05E3, " GeForce GTX 285" },
1665++ { 0x10DE05F9, " Quadro CX" },
1666++ { 0x10DE05FD, " Quadro FX 5800" },
1667++ { 0x10DE05FE, " Quadro FX 4800" },
1668++ { 0x10DE05FF, " Quadro FX 3800" },
1669++ { 0x10DE0600, " GeForce 8800 GTS 512" },
1670++ { 0x10DE0601, " GeForce 9800 GT" },
1671++ { 0x10DE0602, " GeForce 8800 GT" },
1672++ { 0x10DE0604, " GeForce 9800 GX2" },
1673++ { 0x10DE0605, " GeForce 9800 GT" },
1674++ { 0x10DE0606, " GeForce 8800 GS" },
1675++ { 0x10DE0608, " GeForce 9800M GTX" },
1676++ { 0x10DE0609, " GeForce 8800M GTS" },
1677++ { 0x10DE060B, " GeForce 9800M GT" },
1678++ { 0x10DE060C, " GeForce 8800M GTX" },
1679++ { 0x10DE060D, " GeForce 8800 GS" },
1680++ { 0x10DE0610, " GeForce 9600 GSO" },
1681++ { 0x10DE0611, " GeForce 8800 GT" },
1682++ { 0x10DE0612, " GeForce 9800 GTX" },
1683++ { 0x10DE0613, " GeForce 9800 GTX+" },
1684++ { 0x10DE0614, " GeForce 9800 GT" },
1685++ { 0x10DE0615, " GeForce GTS 250" },
1686++ { 0x10DE0617, " GeForce 9800M GTX" },
1687++ { 0x10DE061A, " Quadro FX 3700" },
1688++ { 0x10DE061C, " Quadro FX 3600M" },
1689++ { 0x10DE061E, " Quadro FX 3700M" },
1690++ { 0x10DE0622, " GeForce 9600 GT" },
1691++ { 0x10DE0623, " GeForce 9600 GS" },
1692++ { 0x10DE0625, " GeForce 9600 GSO 512" },
1693++ { 0x10DE0626, " GeForce GT 130" },
1694++ { 0x10DE0627, " GeForce GT 140" },
1695++ { 0x10DE0628, " GeForce 9800M GTS" },
1696++ { 0x10DE062A, " GeForce 9700M GTS" },
1697++ { 0x10DE062B, " GeForce 9800M GS" },
1698++ { 0x10DE062C, " GeForce 9800M GTS" },
1699++ { 0x10DE0638, " Quadro FX 1800" },
1700++ { 0x10DE063A, " Quadro FX 2700M" },
1701++ { 0x10DE0640, " GeForce 9500 GT" },
1702++ { 0x10DE0641, " GeForce 9400 GT" },
1703++ { 0x10DE0643, " GeForce 9500 GT" },
1704++ { 0x10DE0646, " GeForce GT 120" },
1705++ { 0x10DE0647, " GeForce 9600M GT" },
1706++ { 0x10DE0648, " GeForce 9600M GS" },
1707++ { 0x10DE0649, " GeForce 9600M GT" },
1708++ { 0x10DE064A, " GeForce 9700M GT" },
1709++ { 0x10DE064B, " GeForce 9500M G" },
1710++ { 0x10DE064C, " GeForce 9650M GT" },
1711++ { 0x10DE0656, " GeForce 9500 GT" },
1712++ { 0x10DE0658, " Quadro FX 380" },
1713++ { 0x10DE0659, " Quadro FX 580" },
1714++ { 0x10DE065C, " Quadro FX 770M" },
1715++ { 0x10DE06E0, " GeForce 9300 GE" },
1716++ { 0x10DE06E1, " GeForce 9300 GS" },
1717++ { 0x10DE06E4, " GeForce 8400 GS" },
1718++ { 0x10DE06E5, " GeForce 9300M GS" },
1719++ { 0x10DE06E6, " GeForce G100" },
1720++ { 0x10DE06E8, " GeForce 9200M GS" },
1721++ { 0x10DE06E9, " GeForce 9300M GS" },
1722++ { 0x10DE06EA, " Quadro NVS 150M" },
1723++ { 0x10DE06EB, " Quadro NVS 160M" },
1724++ { 0x10DE06F8, " Quadro NVS 420" },
1725++ { 0x10DE06F9, " Quadro FX 370 LP" },
1726++ { 0x10DE06FA, " Quadro NVS 450" },
1727++ { 0x10DE06FD, " Quadro NVS 295" },
1728++ { -1, NULL }
1729++};
1730+diff --git a/src/nvidia_pci_device_match_gen.h b/src/nvidia_pci_device_match_gen.h
1731+index e69de29..a3b34e8 100644
1732+--- a/src/nvidia_pci_device_match_gen.h
1733++++ b/src/nvidia_pci_device_match_gen.h
1734+@@ -0,0 +1,654 @@
1735++/* This file is autogenerated please do not edit */
1736++#if XSERVER_LIBPCIACCESS
1737++#define LIBPCIACCESS_CLASS_SHIFT (PCI_CLASS_SHIFT - 8)
1738++#define LIBPCIACCESS_CLASS_MASK (PCI_CLASS_MASK >> 8)
1739++#define NVIDIA_DEVICE_MATCH(v, d, i) \
1740++ { (v), (d), PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_CLASS_DISPLAY << LIBPCIACCESS_CLASS_SHIFT, LIBPCIACCESS_CLASS_MASK, (i) }
1741++static const struct pci_id_match NVPciIdMatchList[] = {
1742++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA_SGS, 0x0018, 0 ),
1743++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0020, 0 ),
1744++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0028, 0 ),
1745++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0029, 0 ),
1746++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x002A, 0 ),
1747++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x002C, 0 ),
1748++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x002D, 0 ),
1749++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0040, 0 ),
1750++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0041, 0 ),
1751++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0042, 0 ),
1752++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0043, 0 ),
1753++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0044, 0 ),
1754++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0045, 0 ),
1755++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0046, 0 ),
1756++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0047, 0 ),
1757++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0048, 0 ),
1758++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0049, 0 ),
1759++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x004A, 0 ),
1760++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x004B, 0 ),
1761++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x004C, 0 ),
1762++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x004D, 0 ),
1763++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x004E, 0 ),
1764++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x004F, 0 ),
1765++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0090, 0 ),
1766++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0091, 0 ),
1767++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0092, 0 ),
1768++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0093, 0 ),
1769++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0094, 0 ),
1770++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0095, 0 ),
1771++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0096, 0 ),
1772++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0097, 0 ),
1773++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0098, 0 ),
1774++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0099, 0 ),
1775++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x009A, 0 ),
1776++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x009B, 0 ),
1777++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x009C, 0 ),
1778++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x009D, 0 ),
1779++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x009E, 0 ),
1780++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x009F, 0 ),
1781++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x00A0, 0 ),
1782++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x00C0, 0 ),
1783++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x00C1, 0 ),
1784++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x00C2, 0 ),
1785++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x00C3, 0 ),
1786++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x00C4, 0 ),
1787++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x00C5, 0 ),
1788++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x00C6, 0 ),
1789++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x00C7, 0 ),
1790++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x00C8, 0 ),
1791++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x00C9, 0 ),
1792++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x00CA, 0 ),
1793++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x00CB, 0 ),
1794++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x00CC, 0 ),
1795++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x00CD, 0 ),
1796++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x00CE, 0 ),
1797++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x00CF, 0 ),
1798++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0100, 0 ),
1799++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0101, 0 ),
1800++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0103, 0 ),
1801++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0110, 0 ),
1802++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0111, 0 ),
1803++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0112, 0 ),
1804++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0113, 0 ),
1805++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0120, 0 ),
1806++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0121, 0 ),
1807++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0122, 0 ),
1808++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0123, 0 ),
1809++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0124, 0 ),
1810++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0125, 0 ),
1811++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0126, 0 ),
1812++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0127, 0 ),
1813++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0128, 0 ),
1814++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0129, 0 ),
1815++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x012A, 0 ),
1816++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x012B, 0 ),
1817++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x012C, 0 ),
1818++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x012D, 0 ),
1819++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x012E, 0 ),
1820++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x012F, 0 ),
1821++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0140, 0 ),
1822++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0141, 0 ),
1823++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0142, 0 ),
1824++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0143, 0 ),
1825++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0144, 0 ),
1826++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0145, 0 ),
1827++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0146, 0 ),
1828++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0147, 0 ),
1829++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0148, 0 ),
1830++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0149, 0 ),
1831++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x014A, 0 ),
1832++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x014B, 0 ),
1833++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x014C, 0 ),
1834++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x014D, 0 ),
1835++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x014E, 0 ),
1836++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x014F, 0 ),
1837++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0150, 0 ),
1838++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0151, 0 ),
1839++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0152, 0 ),
1840++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0153, 0 ),
1841++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0160, 0 ),
1842++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0161, 0 ),
1843++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0162, 0 ),
1844++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0163, 0 ),
1845++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0164, 0 ),
1846++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0165, 0 ),
1847++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0166, 0 ),
1848++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0167, 0 ),
1849++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0168, 0 ),
1850++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0169, 0 ),
1851++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x016A, 0 ),
1852++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x016B, 0 ),
1853++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x016C, 0 ),
1854++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x016D, 0 ),
1855++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x016E, 0 ),
1856++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x016F, 0 ),
1857++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0170, 0 ),
1858++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0171, 0 ),
1859++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0172, 0 ),
1860++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0173, 0 ),
1861++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0174, 0 ),
1862++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0175, 0 ),
1863++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0176, 0 ),
1864++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0177, 0 ),
1865++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0178, 0 ),
1866++#if !defined(__powerpc__)
1867++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0179, 0 ),
1868++#endif
1869++#if defined(__powerpc__)
1870++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0179, 0 ),
1871++#endif
1872++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x017A, 0 ),
1873++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x017B, 0 ),
1874++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x017C, 0 ),
1875++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x017D, 0 ),
1876++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x017E, 0 ),
1877++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x017F, 0 ),
1878++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0180, 0 ),
1879++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0181, 0 ),
1880++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0182, 0 ),
1881++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0183, 0 ),
1882++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0184, 0 ),
1883++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0185, 0 ),
1884++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0186, 0 ),
1885++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0187, 0 ),
1886++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0188, 0 ),
1887++#if defined(__powerpc__)
1888++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0189, 0 ),
1889++#endif
1890++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x018A, 0 ),
1891++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x018B, 0 ),
1892++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x018C, 0 ),
1893++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x018D, 0 ),
1894++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x018E, 0 ),
1895++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x018F, 0 ),
1896++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0190, 0 ),
1897++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0191, 0 ),
1898++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0192, 0 ),
1899++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0193, 0 ),
1900++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0194, 0 ),
1901++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0194, 0 ),
1902++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0195, 0 ),
1903++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0196, 0 ),
1904++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0197, 0 ),
1905++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0198, 0 ),
1906++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0199, 0 ),
1907++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x019A, 0 ),
1908++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x019B, 0 ),
1909++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x019C, 0 ),
1910++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x019D, 0 ),
1911++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x019D, 0 ),
1912++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x019E, 0 ),
1913++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x019E, 0 ),
1914++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x019F, 0 ),
1915++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x01A0, 0 ),
1916++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x01D0, 0 ),
1917++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x01D1, 0 ),
1918++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x01D2, 0 ),
1919++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x01D3, 0 ),
1920++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x01D4, 0 ),
1921++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x01D5, 0 ),
1922++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x01D6, 0 ),
1923++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x01D7, 0 ),
1924++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x01D8, 0 ),
1925++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x01D9, 0 ),
1926++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x01DA, 0 ),
1927++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x01DB, 0 ),
1928++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x01DC, 0 ),
1929++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x01DD, 0 ),
1930++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x01DE, 0 ),
1931++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x01DF, 0 ),
1932++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x01F0, 0 ),
1933++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0200, 0 ),
1934++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0201, 0 ),
1935++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0202, 0 ),
1936++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0203, 0 ),
1937++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0210, 0 ),
1938++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0211, 0 ),
1939++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0212, 0 ),
1940++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0213, 0 ),
1941++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0214, 0 ),
1942++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0215, 0 ),
1943++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0216, 0 ),
1944++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0217, 0 ),
1945++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0218, 0 ),
1946++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0219, 0 ),
1947++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x021A, 0 ),
1948++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x021B, 0 ),
1949++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x021C, 0 ),
1950++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x021D, 0 ),
1951++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x021E, 0 ),
1952++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x021F, 0 ),
1953++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0220, 0 ),
1954++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0221, 0 ),
1955++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0222, 0 ),
1956++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0223, 0 ),
1957++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0224, 0 ),
1958++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0225, 0 ),
1959++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0226, 0 ),
1960++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0227, 0 ),
1961++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0228, 0 ),
1962++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0229, 0 ),
1963++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x022A, 0 ),
1964++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x022B, 0 ),
1965++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x022C, 0 ),
1966++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x022D, 0 ),
1967++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x022E, 0 ),
1968++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x022F, 0 ),
1969++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0240, 0 ),
1970++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0241, 0 ),
1971++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0242, 0 ),
1972++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0243, 0 ),
1973++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0244, 0 ),
1974++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0245, 0 ),
1975++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0246, 0 ),
1976++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0247, 0 ),
1977++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0248, 0 ),
1978++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0249, 0 ),
1979++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x024A, 0 ),
1980++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x024B, 0 ),
1981++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x024C, 0 ),
1982++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x024D, 0 ),
1983++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x024E, 0 ),
1984++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x024F, 0 ),
1985++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0250, 0 ),
1986++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0251, 0 ),
1987++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0252, 0 ),
1988++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0253, 0 ),
1989++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0254, 0 ),
1990++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0255, 0 ),
1991++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0256, 0 ),
1992++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0257, 0 ),
1993++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0258, 0 ),
1994++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0259, 0 ),
1995++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x025A, 0 ),
1996++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x025B, 0 ),
1997++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x025C, 0 ),
1998++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x025D, 0 ),
1999++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x025E, 0 ),
2000++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x025F, 0 ),
2001++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0280, 0 ),
2002++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0281, 0 ),
2003++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0282, 0 ),
2004++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0283, 0 ),
2005++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0284, 0 ),
2006++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0285, 0 ),
2007++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0286, 0 ),
2008++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0287, 0 ),
2009++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0288, 0 ),
2010++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0289, 0 ),
2011++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x028A, 0 ),
2012++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x028B, 0 ),
2013++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x028C, 0 ),
2014++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x028D, 0 ),
2015++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x028E, 0 ),
2016++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x028F, 0 ),
2017++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0290, 0 ),
2018++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0291, 0 ),
2019++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0292, 0 ),
2020++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0293, 0 ),
2021++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0294, 0 ),
2022++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0295, 0 ),
2023++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0296, 0 ),
2024++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0297, 0 ),
2025++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0298, 0 ),
2026++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0299, 0 ),
2027++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x029A, 0 ),
2028++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x029B, 0 ),
2029++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x029C, 0 ),
2030++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x029D, 0 ),
2031++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x029E, 0 ),
2032++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x029F, 0 ),
2033++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0300, 0 ),
2034++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0301, 0 ),
2035++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0302, 0 ),
2036++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0303, 0 ),
2037++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0304, 0 ),
2038++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0305, 0 ),
2039++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0306, 0 ),
2040++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0307, 0 ),
2041++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0308, 0 ),
2042++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0309, 0 ),
2043++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x030A, 0 ),
2044++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x030B, 0 ),
2045++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x030C, 0 ),
2046++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x030D, 0 ),
2047++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x030E, 0 ),
2048++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x030F, 0 ),
2049++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0310, 0 ),
2050++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0311, 0 ),
2051++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0312, 0 ),
2052++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0313, 0 ),
2053++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0314, 0 ),
2054++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0315, 0 ),
2055++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0316, 0 ),
2056++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0317, 0 ),
2057++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0318, 0 ),
2058++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0319, 0 ),
2059++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x031A, 0 ),
2060++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x031B, 0 ),
2061++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x031C, 0 ),
2062++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x031D, 0 ),
2063++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x031E, 0 ),
2064++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x031F, 0 ),
2065++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0320, 0 ),
2066++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0321, 0 ),
2067++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0322, 0 ),
2068++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0323, 0 ),
2069++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0324, 0 ),
2070++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0325, 0 ),
2071++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0326, 0 ),
2072++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0327, 0 ),
2073++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0328, 0 ),
2074++#if defined(__powerpc__)
2075++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0329, 0 ),
2076++#endif
2077++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x032A, 0 ),
2078++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x032B, 0 ),
2079++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x032C, 0 ),
2080++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x032D, 0 ),
2081++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x032E, 0 ),
2082++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x032F, 0 ),
2083++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0330, 0 ),
2084++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0331, 0 ),
2085++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0332, 0 ),
2086++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0333, 0 ),
2087++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0334, 0 ),
2088++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0335, 0 ),
2089++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0336, 0 ),
2090++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0337, 0 ),
2091++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0338, 0 ),
2092++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0339, 0 ),
2093++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x033A, 0 ),
2094++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x033B, 0 ),
2095++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x033C, 0 ),
2096++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x033D, 0 ),
2097++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x033E, 0 ),
2098++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x033F, 0 ),
2099++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0340, 0 ),
2100++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0341, 0 ),
2101++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0342, 0 ),
2102++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0343, 0 ),
2103++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0344, 0 ),
2104++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0345, 0 ),
2105++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0346, 0 ),
2106++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0347, 0 ),
2107++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0348, 0 ),
2108++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0349, 0 ),
2109++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x034A, 0 ),
2110++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x034B, 0 ),
2111++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x034C, 0 ),
2112++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x034D, 0 ),
2113++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x034E, 0 ),
2114++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x034F, 0 ),
2115++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0390, 0 ),
2116++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0391, 0 ),
2117++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0392, 0 ),
2118++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0393, 0 ),
2119++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0394, 0 ),
2120++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0395, 0 ),
2121++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0396, 0 ),
2122++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0397, 0 ),
2123++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0398, 0 ),
2124++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0399, 0 ),
2125++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x039A, 0 ),
2126++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x039B, 0 ),
2127++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x039C, 0 ),
2128++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x039D, 0 ),
2129++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x039E, 0 ),
2130++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x039F, 0 ),
2131++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x03D0, 0 ),
2132++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x03D1, 0 ),
2133++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x03D2, 0 ),
2134++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x03D3, 0 ),
2135++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x03D4, 0 ),
2136++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x03D5, 0 ),
2137++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x03D6, 0 ),
2138++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x03D7, 0 ),
2139++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x03D8, 0 ),
2140++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x03D9, 0 ),
2141++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x03DA, 0 ),
2142++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x03DB, 0 ),
2143++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x03DC, 0 ),
2144++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x03DD, 0 ),
2145++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x03DE, 0 ),
2146++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x03DF, 0 ),
2147++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0400, 0 ),
2148++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0401, 0 ),
2149++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0402, 0 ),
2150++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0403, 0 ),
2151++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0404, 0 ),
2152++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0405, 0 ),
2153++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0406, 0 ),
2154++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0407, 0 ),
2155++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0408, 0 ),
2156++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0409, 0 ),
2157++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x040A, 0 ),
2158++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x040B, 0 ),
2159++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x040C, 0 ),
2160++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x040D, 0 ),
2161++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x040E, 0 ),
2162++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x040F, 0 ),
2163++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0420, 0 ),
2164++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0421, 0 ),
2165++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0422, 0 ),
2166++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0423, 0 ),
2167++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0424, 0 ),
2168++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0425, 0 ),
2169++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0426, 0 ),
2170++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0427, 0 ),
2171++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0428, 0 ),
2172++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0429, 0 ),
2173++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x042A, 0 ),
2174++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x042B, 0 ),
2175++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x042C, 0 ),
2176++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x042D, 0 ),
2177++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x042E, 0 ),
2178++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x042F, 0 ),
2179++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05E0, 0 ),
2180++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05E1, 0 ),
2181++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05E2, 0 ),
2182++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05E3, 0 ),
2183++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05E4, 0 ),
2184++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05E5, 0 ),
2185++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05E6, 0 ),
2186++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05E7, 0 ),
2187++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05E8, 0 ),
2188++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05E9, 0 ),
2189++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05EA, 0 ),
2190++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05EB, 0 ),
2191++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05EC, 0 ),
2192++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05ED, 0 ),
2193++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05EE, 0 ),
2194++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05EF, 0 ),
2195++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05F0, 0 ),
2196++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05F1, 0 ),
2197++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05F2, 0 ),
2198++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05F3, 0 ),
2199++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05F4, 0 ),
2200++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05F5, 0 ),
2201++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05F6, 0 ),
2202++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05F7, 0 ),
2203++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05F8, 0 ),
2204++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05F9, 0 ),
2205++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05FA, 0 ),
2206++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05FB, 0 ),
2207++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05FC, 0 ),
2208++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05FD, 0 ),
2209++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05FE, 0 ),
2210++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05FF, 0 ),
2211++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0600, 0 ),
2212++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0601, 0 ),
2213++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0602, 0 ),
2214++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0603, 0 ),
2215++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0604, 0 ),
2216++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0605, 0 ),
2217++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0606, 0 ),
2218++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0607, 0 ),
2219++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0608, 0 ),
2220++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0609, 0 ),
2221++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x060A, 0 ),
2222++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x060B, 0 ),
2223++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x060C, 0 ),
2224++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x060D, 0 ),
2225++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x060E, 0 ),
2226++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x060F, 0 ),
2227++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0610, 0 ),
2228++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0611, 0 ),
2229++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0612, 0 ),
2230++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0613, 0 ),
2231++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0614, 0 ),
2232++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0615, 0 ),
2233++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0617, 0 ),
2234++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0618, 0 ),
2235++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0619, 0 ),
2236++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x061A, 0 ),
2237++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x061B, 0 ),
2238++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x061C, 0 ),
2239++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x061D, 0 ),
2240++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x061E, 0 ),
2241++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x061F, 0 ),
2242++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0620, 0 ),
2243++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0621, 0 ),
2244++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0622, 0 ),
2245++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0623, 0 ),
2246++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0624, 0 ),
2247++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0625, 0 ),
2248++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0626, 0 ),
2249++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0627, 0 ),
2250++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0628, 0 ),
2251++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0629, 0 ),
2252++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x062A, 0 ),
2253++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x062B, 0 ),
2254++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x062C, 0 ),
2255++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x062D, 0 ),
2256++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x062E, 0 ),
2257++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x062F, 0 ),
2258++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0630, 0 ),
2259++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0631, 0 ),
2260++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0632, 0 ),
2261++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0633, 0 ),
2262++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0634, 0 ),
2263++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0635, 0 ),
2264++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0636, 0 ),
2265++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0637, 0 ),
2266++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0638, 0 ),
2267++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0639, 0 ),
2268++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x063A, 0 ),
2269++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x063B, 0 ),
2270++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x063C, 0 ),
2271++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x063D, 0 ),
2272++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x063E, 0 ),
2273++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x063F, 0 ),
2274++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0640, 0 ),
2275++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0641, 0 ),
2276++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0642, 0 ),
2277++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0643, 0 ),
2278++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0644, 0 ),
2279++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0645, 0 ),
2280++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0646, 0 ),
2281++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0647, 0 ),
2282++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0648, 0 ),
2283++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0649, 0 ),
2284++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x064A, 0 ),
2285++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x064B, 0 ),
2286++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x064C, 0 ),
2287++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x064D, 0 ),
2288++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x064E, 0 ),
2289++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x064F, 0 ),
2290++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0650, 0 ),
2291++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0651, 0 ),
2292++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0652, 0 ),
2293++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0653, 0 ),
2294++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0654, 0 ),
2295++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0655, 0 ),
2296++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0656, 0 ),
2297++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0657, 0 ),
2298++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0658, 0 ),
2299++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0659, 0 ),
2300++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x065A, 0 ),
2301++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x065B, 0 ),
2302++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x065C, 0 ),
2303++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x065D, 0 ),
2304++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x065E, 0 ),
2305++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x065F, 0 ),
2306++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06E0, 0 ),
2307++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06E1, 0 ),
2308++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06E2, 0 ),
2309++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06E3, 0 ),
2310++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06E4, 0 ),
2311++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06E5, 0 ),
2312++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06E6, 0 ),
2313++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06E7, 0 ),
2314++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06E8, 0 ),
2315++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06E9, 0 ),
2316++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06EA, 0 ),
2317++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06EB, 0 ),
2318++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06EC, 0 ),
2319++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06ED, 0 ),
2320++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06EE, 0 ),
2321++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06EF, 0 ),
2322++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06F0, 0 ),
2323++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06F1, 0 ),
2324++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06F2, 0 ),
2325++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06F3, 0 ),
2326++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06F4, 0 ),
2327++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06F5, 0 ),
2328++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06F6, 0 ),
2329++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06F7, 0 ),
2330++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06F8, 0 ),
2331++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06F9, 0 ),
2332++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06FA, 0 ),
2333++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06FB, 0 ),
2334++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06FC, 0 ),
2335++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06FD, 0 ),
2336++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06FE, 0 ),
2337++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x06FF, 0 ),
2338++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A60, 0 ),
2339++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A61, 0 ),
2340++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A62, 0 ),
2341++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A63, 0 ),
2342++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A64, 0 ),
2343++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A65, 0 ),
2344++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A66, 0 ),
2345++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A67, 0 ),
2346++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A68, 0 ),
2347++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A69, 0 ),
2348++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A6A, 0 ),
2349++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A6B, 0 ),
2350++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A6C, 0 ),
2351++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A6D, 0 ),
2352++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A6E, 0 ),
2353++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A6F, 0 ),
2354++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A70, 0 ),
2355++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A71, 0 ),
2356++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A72, 0 ),
2357++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A73, 0 ),
2358++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A74, 0 ),
2359++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A75, 0 ),
2360++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A76, 0 ),
2361++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A77, 0 ),
2362++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A78, 0 ),
2363++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A79, 0 ),
2364++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A7A, 0 ),
2365++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A7B, 0 ),
2366++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A7C, 0 ),
2367++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A7D, 0 ),
2368++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A7E, 0 ),
2369++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0A7F, 0 ),
2370++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0CA0, 0 ),
2371++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0CA1, 0 ),
2372++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0CA2, 0 ),
2373++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0CA3, 0 ),
2374++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0CA4, 0 ),
2375++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0CA5, 0 ),
2376++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0CA6, 0 ),
2377++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0CA7, 0 ),
2378++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0CA8, 0 ),
2379++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0CA9, 0 ),
2380++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0CAA, 0 ),
2381++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0CAB, 0 ),
2382++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0CAC, 0 ),
2383++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0CAD, 0 ),
2384++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0CAE, 0 ),
2385++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0CAF, 0 ),
2386++ { 0, 0, 0 }
2387++};
2388++#endif
2389+--
2390+1.6.0.4
2391+
2392
2393=== added file 'debian/patches/105_gf7025_gf7050.patch'
2394--- debian/patches/105_gf7025_gf7050.patch 1970-01-01 00:00:00 +0000
2395+++ debian/patches/105_gf7025_gf7050.patch 2010-06-08 09:18:27 +0000
2396@@ -0,0 +1,111 @@
2397+Index: xserver-xorg-video-nv-2.1.14/src/nv_driver.c
2398+===================================================================
2399+--- xserver-xorg-video-nv-2.1.14.orig/src/nv_driver.c 2009-09-12 10:14:08.000000000 -0500
2400++++ xserver-xorg-video-nv-2.1.14/src/nv_driver.c 2009-09-12 10:14:08.000000000 -0500
2401+@@ -1250,6 +1250,7 @@
2402+ case 0x0290: /* GeForce 7900 */
2403+ case 0x0390: /* GeForce 7600 */
2404+ case 0x0240: /* GeForce 6100 */
2405++ case 0x0530: /* GeForce 7050, 7025 */
2406+ case 0x03D0:
2407+ pNv->Architecture = NV_ARCH_40;
2408+ break;
2409+Index: xserver-xorg-video-nv-2.1.14/src/nv_hw.c
2410+===================================================================
2411+--- xserver-xorg-video-nv-2.1.14.orig/src/nv_hw.c 2009-05-06 21:14:11.000000000 -0500
2412++++ xserver-xorg-video-nv-2.1.14/src/nv_hw.c 2009-09-12 10:14:08.000000000 -0500
2413+@@ -890,7 +890,8 @@
2414+ case NV_ARCH_30:
2415+ default:
2416+ if(((pNv->Chipset & 0xfff0) == 0x0240) ||
2417+- ((pNv->Chipset & 0xfff0) == 0x03D0))
2418++ ((pNv->Chipset & 0xfff0) == 0x03D0) ||
2419++ ((pNv->Chipset & 0xfff0) == 0x0530))
2420+ {
2421+ state->arbitration0 = 128;
2422+ state->arbitration1 = 0x0480;
2423+@@ -1226,6 +1227,7 @@
2424+ case 0x01D0:
2425+ case 0x0240:
2426+ case 0x03D0:
2427++ case 0x0530:
2428+ pNv->PMC[0x1700/4] = pNv->PFB[0x020C/4];
2429+ pNv->PMC[0x1704/4] = 0;
2430+ pNv->PMC[0x1708/4] = 0;
2431+@@ -1316,7 +1318,8 @@
2432+ pNv->PGRAPH[(0x0900/4) + i] = pNv->PFB[(0x0600/4) + i];
2433+ if(((pNv->Chipset & 0xfff0) != 0x0160) &&
2434+ ((pNv->Chipset & 0xfff0) != 0x0220) &&
2435+- ((pNv->Chipset & 0xfff0) != 0x0240))
2436++ ((pNv->Chipset & 0xfff0) != 0x0240) &&
2437++ ((pNv->Chipset & 0xfff0) != 0x0530))
2438+ {
2439+ pNv->PGRAPH[(0x6900/4) + i] = pNv->PFB[(0x0600/4) + i];
2440+ }
2441+Index: xserver-xorg-video-nv-2.1.14/src/nvidia_chipset_gen.h
2442+===================================================================
2443+--- xserver-xorg-video-nv-2.1.14.orig/src/nvidia_chipset_gen.h 2009-09-12 10:14:28.000000000 -0500
2444++++ xserver-xorg-video-nv-2.1.14/src/nvidia_chipset_gen.h 2009-09-12 10:14:46.000000000 -0500
2445+@@ -261,6 +261,8 @@
2446+ { 0x10DE05E1, " GeForce GTX 280" },
2447+ { 0x10DE05E2, " GeForce GTX 260" },
2448+ { 0x10DE05E3, " GeForce GTX 285" },
2449++ { 0x10DE053B, " GeForce 7050" },
2450++ { 0x10DE053E, " GeForce 7025" },
2451+ { 0x10DE05F9, " Quadro CX" },
2452+ { 0x10DE05FD, " Quadro FX 5800" },
2453+ { 0x10DE05FE, " Quadro FX 4800" },
2454+Index: xserver-xorg-video-nv-2.1.14/src/nvidia_pci_device_match_gen.h
2455+===================================================================
2456+--- xserver-xorg-video-nv-2.1.14.orig/src/nvidia_pci_device_match_gen.h 2009-09-12 10:14:28.000000000 -0500
2457++++ xserver-xorg-video-nv-2.1.14/src/nvidia_pci_device_match_gen.h 2009-09-12 10:14:46.000000000 -0500
2458+@@ -446,6 +446,22 @@
2459+ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05E1, 0 ),
2460+ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05E2, 0 ),
2461+ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05E3, 0 ),
2462++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0530, 0 ),
2463++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0531, 0 ),
2464++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0532, 0 ),
2465++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0533, 0 ),
2466++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0534, 0 ),
2467++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0535, 0 ),
2468++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0536, 0 ),
2469++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0537, 0 ),
2470++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0538, 0 ),
2471++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x0539, 0 ),
2472++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x053A, 0 ),
2473++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x053B, 0 ),
2474++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x053C, 0 ),
2475++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x053D, 0 ),
2476++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x053E, 0 ),
2477++ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x053F, 0 ),
2478+ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05E4, 0 ),
2479+ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05E5, 0 ),
2480+ NVIDIA_DEVICE_MATCH( PCI_VENDOR_NVIDIA, 0x05E6, 0 ),
2481+Index: xserver-xorg-video-nv-2.1.14/src/pcidb/nv_list.csv
2482+===================================================================
2483+--- xserver-xorg-video-nv-2.1.14.orig/src/pcidb/nv_list.csv 2009-09-12 10:14:14.000000000 -0500
2484++++ xserver-xorg-video-nv-2.1.14/src/pcidb/nv_list.csv 2009-09-12 10:13:05.000000000 -0500
2485+@@ -433,6 +433,22 @@
2486+ "10DE","05E1",," GeForce GTX 280"
2487+ "10DE","05E2",," GeForce GTX 260"
2488+ "10DE","05E3",," GeForce GTX 285"
2489++"10DE","0530",,
2490++"10DE","0531",,
2491++"10DE","0532",,
2492++"10DE","0533",,
2493++"10DE","0534",,
2494++"10DE","0535",,
2495++"10DE","0536",,
2496++"10DE","0537",,
2497++"10DE","0538",,
2498++"10DE","0539",,
2499++"10DE","053A",,
2500++"10DE","053B",," GeForce 7050"
2501++"10DE","053C",,
2502++"10DE","053D",,
2503++"10DE","053E",," GeForce 7025"
2504++"10DE","053F",,
2505+ "10DE","05E4",,
2506+ "10DE","05E5",,
2507+ "10DE","05E6",,
2508
2509=== modified file 'debian/patches/series'
2510--- debian/patches/series 2010-06-08 18:22:37 +0000
2511+++ debian/patches/series 2010-06-08 09:18:27 +0000
2512@@ -1,1 +1,10 @@
2513-01_fix_linking.diff
2514+<<<<<<< TREE
2515+01_fix_linking.diff
2516+=======
2517+01_fix_linking.diff
2518+# ubuntu patches
2519+0001-Move-the-logic-for-matching-devices-out-of-probe-rou.patch
2520+0002-Run-the-parsing-script-to-generate-an-initial-list-o.patch
2521+100_fedora-panel-fix.patch
2522+
2523+>>>>>>> MERGE-SOURCE
2524
2525=== modified file 'debian/rules'
2526--- debian/rules 2010-06-08 18:22:37 +0000
2527+++ debian/rules 2010-06-08 09:18:27 +0000
2528@@ -44,8 +44,13 @@
2529 --infodir=\$${prefix}/share/info $(confflags) \
2530 CFLAGS="$(CFLAGS)"
2531
2532+<<<<<<< TREE
2533 build: build-stamp
2534 build-stamp: build/config.status
2535+=======
2536+build: patch build-stamp
2537+build-stamp: build/config.status
2538+>>>>>>> MERGE-SOURCE
2539 dh_testdir
2540 cd build && $(MAKE)
2541 >$@

Subscribers

People subscribed via source and target branches

to all changes: