summaryrefslogtreecommitdiff
blob: c3261a63031741c93aecd5fb3a618d09f8ab0ce3 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
diff -urN hwdata-0.158.orig/Cards hwdata-0.158/Cards
--- hwdata-0.158.orig/Cards	2005-04-10 21:40:42.000000000 -0400
+++ hwdata-0.158/Cards	2005-11-16 09:32:09.000000000 -0500
@@ -2014,130 +2014,89 @@
 CHIPSET RV200
 DRIVER radeon
 
+NAME ATI Radeon (fglrx)
+DRIVER fglrx
+
 NAME ATI Radeon 8500
-CHIPSET R200
-DRIVER radeon
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon 8500LE
-CHIPSET R200
-DRIVER radeon
+SEE ATI Radeon (fglrx)
 
 NAME ATI FireGL 8700
-CHIPSET R200
-DRIVER radeon
+SEE ATI Radeon (fglrx)
 
 NAME ATI FireGL 8800
-CHIPSET R200
-DRIVER radeon
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon 9000
-CHIPSET R250
-DRIVER radeon
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon 9000 Pro
-CHIPSET R250
-DRIVER radeon
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon 9100
-CHIPSET R250
-DRIVER radeon
+SEE ATI Radeon R250 (fglrx)
 
 NAME ATI Radeon Mobility M9
-CHIPSET R250
-DRIVER radeon
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon 9200
-CHIPSET R250
-DRIVER radeon
-LINE #Option "nodri"
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon 9200SE
-CHIPSET R250
-DRIVER radeon
-LINE #Option "nodri"
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon 9500
-CHIPSET R300
-DRIVER radeon
-LINE #Option "nodri"
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon 9500 Pro
-CHIPSET R300
-DRIVER radeon
-LINE #Option "nodri"
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon 9600
-CHIPSET R300
-DRIVER radeon
-LINE #Option "nodri"
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon 9600 Pro
-CHIPSET R300
-DRIVER radeon
-LINE #Option "nodri"
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon Mobility 9600 M10
-CHIPSET RV350
-DRIVER radeon
-LINE #Option "nodri"
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon 9700
-CHIPSET R300
-DRIVER radeon
-LINE #Option "nodri"
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon 9700 Pro
-CHIPSET R300
-DRIVER radeon
-LINE #Option "nodri"
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon 9800
-CHIPSET R350
-DRIVER radeon
-LINE #Option "nodri"
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon 9800 Pro
-CHIPSET R350
-DRIVER radeon
-LINE #Option "nodri"
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon 9800 XT
-CHIPSET R350
-DRIVER radeon
-LINE #Option "nodri"
+SEE ATI Radeon (fglrx)
 
 NAME ATI FireGL Z1/X1
-CHIPSET R300
-DRIVER radeon
-LINE #Option "nodri"
+SEE ATI Radeon (fglrx)
 
 NAME ATI FireGL X1
-CHIPSET R300
-DRIVER radeon
-LINE #Option "nodri"
+SEE ATI Radeon (fglrx)
 
 NAME ATI FireGL X2
-CHIPSET RV350
-DRIVER radeon
-LINE #Option "nodri"
+SEE ATI Radeon (fglrx)
 
 NAME ATI FireGL Z1
-CHIPSET R300
-DRIVER radeon
-LINE #Option "nodri"
+SEE ATI Radeon (fglrx)
 
 NAME ATI FireGL T2
-CHIPSET RV350
-DRIVER radeon
+SEE ATI Radeon (fglrx)
 
 NAME ATI FireGL Mobility T2
-CHIPSET RV350
-DRIVER radeon
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon Mobility U1
-CHIPSET R300
-DRIVER radeon
-LINE #Option "nodri"
+SEE ATI Radeon (fglrx)
 
 NAME ATI FireGL D1100
 DRIVER radeon
@@ -2167,7 +2126,7 @@
 DRIVER radeon
 
 NAME ATI FireGL X3
-DRIVER radeon
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon 7000 IGP
 DRIVER radeon
@@ -2197,37 +2156,37 @@
 DRIVER radeon
 
 NAME ATI Radeon Mobility 9200
-DRIVER radeon
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon Mobility 9200 IGP
 DRIVER radeon
 
 NAME ATI Radeon Mobility 9800
-DRIVER radeon
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon Mobility M300
-DRIVER radeon
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon Mobility X600
-DRIVER radeon
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon X800LE
-DRIVER radeon
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon X800PRO
-DRIVER radeon
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon X800SE
-DRIVER radeon
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon X300
-DRIVER radeon
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon X600
-DRIVER radeon
+SEE ATI Radeon (fglrx)
 
 NAME ATI Radeon X800XT
-DRIVER radeon
+SEE ATI Radeon (fglrx)
 
 ######################################################################
 NAME ATI Rage Fury Pro AGP
@@ -3191,30 +3150,25 @@
 DRIVER nv
 NOCLOCKPROBE
 
-NAME RIVA TNT
-CHIPSET RIVATNT
-DRIVER nv
+NAME NVIDIA (nvidia)
+DRIVER nvidia
 NOCLOCKPROBE
 
+NAME RIVA TNT
+SEE NVIDIA (nvidia)
+
 NAME RIVA TNT2
-CHIPSET RIVATNT2
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 # mharris - Nov 23, 2002 - Commented out the swcursor option, if it is still
 # needed, then lets disable it right in the driver completely, or possibly
 # fix it.
 # swcursor added to default configuration for bug #22173
 NAME RIVA Ultra TNT2 
-CHIPSET RIVA ULTRA TNT2 
-DRIVER nv
-LINE #Option "swcursor"
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA GeForce
-CHIPSET GeForce
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME ELSA VICTORY ERAZOR
 SEE RIVA128
@@ -3226,19 +3180,19 @@
 SEE RIVA128
 
 NAME ELSA ERAZOR II
-SEE RIVA TNT
+SEE NVIDIA (nvidia)
 
 NAME ELSA ERAZOR III
-SEE RIVA TNT2
+SEE NVIDIA (nvidia)
 
 NAME ELSA Synergy II
-SEE RIVA TNT2
+SEE NVIDIA (nvidia)
 
 NAME Leadtek WinFast 3D S320II
-SEE RIVA TNT2
+SEE NVIDIA (nvidia)
 
 NAME Leadtek WinFast 3D S320
-SEE RIVA TNT
+SEE NVIDIA (nvidia)
 
 NAME Leadtek WinFast 3D S3500
 SEE RIVA128
@@ -3247,13 +3201,13 @@
 SEE RIVA128
 
 NAME Diamond Viper 550
-SEE RIVA TNT
+SEE NVIDIA (nvidia)
 
 NAME Diamond Viper 770
-SEE RIVA TNT2
+SEE NVIDIA (nvidia)
 
 NAME AOpen PS3010
-SEE RIVA TNT2
+SEE NVIDIA (nvidia)
 
 NAME STB Velocity 128
 SEE RIVA128
@@ -3268,173 +3222,138 @@
 SEE RIVA128
 
 NAME Chaintech Desperado RI30
-SEE RIVA TNT
+SEE NVIDIA (nvidia)
 
 NAME Chaintech Desperado RI40/41
-SEE RIVA TNT2
+SEE NVIDIA (nvidia)
 
 NAME Chaintech Desperado RI50
-SEE RIVA TNT2
+SEE NVIDIA (nvidia)
 
 NAME Chaintech Desperado RI60
-SEE RIVA TNT2
+SEE NVIDIA (nvidia)
 
 NAME Graphics Blaster TNT
-SEE RIVA TNT
+SEE NVIDIA (nvidia)
 
 NAME Creative Graphics Blaster TNT2
-SEE RIVA TNT2
+SEE NVIDIA (nvidia)
 
 NAME Hercules Dynamite TNT
-SEE RIVA TNT
+SEE NVIDIA (nvidia)
 
 NAME MELCO WGA-TS 
-SEE RIVA TNT2 
+SEE NVIDIA (nvidia)
 
 NAME Canopus SPECTRA 3200R2 
-SEE RIVA TNT 
+SEE NVIDIA (nvidia)
 
 NAME Canopus SPECTRA 5400 
-SEE RIVA TNT2 
+SEE NVIDIA (nvidia)
 
 NAME Canopus SPECTRA 5400 Premium Edition 
-SEE RIVA Ultra TNT2 
+SEE NVIDIA (nvidia)
 
 NAME Guillemot Maxi Gamer Xentor 32
-SEE RIVA TNT2
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA Riva 128 (generic)
 SEE RIVA128
 
 NAME NVIDIA Riva TNT (generic)
-SEE RIVA TNT
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA Riva TNT2 (generic)
-SEE RIVA TNT2
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA GeForce 256 (generic)
-CHIPSET GeForce 256
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA GeForce DDR (generic)
-CHIPSET GeForce DDR
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA GeForce 2 (generic)
-CHIPSET GeForce 2
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA GeForce 2 MX (generic)
-SEE NVIDIA GeForce 2 (generic)
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA GeForce 2 GTS (generic)
-SEE NVIDIA GeForce 2 (generic)
+SEE NVIDIA (nvidia)
 
-# Supported in XFree86 4.3.0
-# UNSUPPORTED by XFree86 4.2.1 and earlier
 NAME nVidia GeForce 2 Go
-SEE NVIDIA GeForce 2 (generic)
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA GeForce 3 (generic)
-CHIPSET GeForce 3
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 # mharris - Nov 23, 2002 - enabling "nv" driver for GeForce 4 and Quadro 4 as
 # CVS XFree86 support them now in 4.2.99.2
 NAME NVIDIA GeForce 4 (generic)
-CHIPSET GeForce 4
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA GeForce 4 MX (generic)
-SEE NVIDIA GeForce 4 (generic)
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA Quadro 4 (generic)
-CHIPSET Quadro 4
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA GeForce FX (generic)
-CHIPSET GeForce FX
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA Quadro FX (generic)
-CHIPSET Quadro FX
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA GeForce 6200
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA GeForce 6600
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA GeForce 6600 GT
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA GeForce 6610 XL
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA GeForce 6800
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA GeForce 6800 GT
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA GeForce 6800 LE
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA GeForce 6800 Ultra
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA GeForce FX 5100
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA GeForce FX 5500
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA GeForce Go 6600
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA GeForce Go 6600 TE/6200 TE
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
-NAME NVIDIA GeForce4 448 Go
-DRIVER nv
-NOCLOCKPROBE
+NAME NVIDIA GeForce4 440 Go
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA Quadro FX 4000
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA Quadro FX 4400
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA Quadro FX 540
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA Quadro FX 700
-DRIVER nv
-NOCLOCKPROBE
+SEE NVIDIA (nvidia)
 
 NAME NVIDIA Quadro NVS 50 PCI
 DRIVER nv