S3 cleanup stage 3: Savage

2 files changed, 136 insertions, 811 deletions

diff --git a/lst/Cards+ b/lst/Cards+
index 56f02b68..8e7f65d0 100644
--- a/lst/Cards+
+++ b/lst/Cards+
@@ -106,7 +106,7 @@ SEE Chips & Technologies CT64200
 # Cirrus Logic
 
 #tested
-NAME Cirrus Logic GD542x
+NAME Cirrus Logic GD542x-based cards
 DRIVER vga
 LINE # Device section for Cirrus Logic GD5420/2/4/6/8/9-based cards.
 LINE     #MemBase 0x00e00000
@@ -114,7 +114,7 @@ LINE     #MemBase 0x04e00000
 LINE     #Option "linear"
 
 #tested
-NAME Cirrus Logic GD543x
+NAME Cirrus Logic GD543x-based cards
 DRIVER cirrus
 LINE # Device section for Cirrus Logic GD5430/34-based cards.
 LINE     #MemBase 0x00e00000		# ISA card that maps to 14Mb
@@ -123,60 +123,22 @@ LINE     #MemBase 0x80000000		# VLB card that maps to 2048Mb
 LINE     #MemBase 0x02000000		# VLB card that maps to 32Mb
 LINE     #Option "linear"
 
-NAME Cirrus Logic GD544x
+NAME Cirrus Logic GD544x-based cards
 DRIVER cirrus
 
-NAME Creative Labs Graphics Blaster MA201
-SEE Cirrus Logic GD544x
-
-NAME Creative Labs Graphics Blaster MA202
-SEE Cirrus Logic GD544x
-
-#tested
-NAME Cirrus Logic GD5462
-DRIVER cirrus
-LINE #Option "fifo_conservative"
-
-#tested
-NAME Cirrus Logic GD5464
-DRIVER cirrus
-LINE #Option "fifo_conservative"
-
 #tested
-NAME Cirrus Logic GD5465
+NAME Cirrus Logic GD546x-based cards
 DRIVER cirrus
 LINE #Option "fifo_conservative"
 
-NAME Creative Labs Graphics Blaster MA302
-SEE Cirrus Logic GD5462
-
-NAME Creative Labs Graphics Blaster MA334
-SEE Cirrus Logic GD5464
-
-NAME Creative Labs Graphics Blaster 3D
-SEE Cirrus Logic GD5464
-
 # reported not working on SGI 1200 as of 02/22/2001 (RH)
 # reported working on XF 4.2.0 by Juan (MDK)
 NAME Cirrus Logic GD5480
 DRIVER cirrus
 
-#tested
-NAME Diamond SpeedStar 64
-SEE Cirrus Logic GD543x
-
-NAME Diamond SpeedStar64 Graphics 2000/2200
-SEE Cirrus Logic GD543x
-
-NAME Diamond SpeedStar Pro SE (CL-GD5430/5434)
-SEE Cirrus Logic GD543x
-
-NAME Diamond SpeedStar Pro 1100
-SEE Cirrus Logic GD542x
-
-NAME Orchid Kelvin 64 VLB Rev A
+NAME Orchid Kelvin 64 VLB
 DRIVER cirrus
-LINE # Device section for Orchid Kelvin 64 VLB Rev A
+LINE # Device section for Orchid Kelvin 64 VLB
 LINE # Linear framebuffer maps at 2048Mb. Some motherboards make linear addressing
 LINE # impossible. Some cards map at 32Mb.
 LINE     #MemBase 0x02000000		# VLB card that maps to 32Mb
@@ -184,71 +146,9 @@ LINE     #MemBase 0x04000000		# VLB card that maps to 64Mb
 LINE     MemBase 0x80000000		# VLB card that maps to 2048Mb
 LINE     #Option "linear"
 
-NAME Orchid Kelvin 64 VLB Rev B
-DRIVER cirrus
-LINE # Device section for Orchid Kelvin 64 VLB Rev B
-LINE # Linear framebuffer maps at 32Mb. Some motherboards make linear addressing
-LINE # impossible. Some cards map at 2048Mb.
-LINE     MemBase 0x02000000		# VLB card that maps to 32Mb
-LINE     #MemBase 0x04000000		# VLB card that maps to 64Mb
-LINE     #MemBase 0x80000000		# VLB card that maps to 2048Mb
-LINE     #Option "linear"
-
-NAME Orchid Kelvin 64
-SEE Cirrus Logic GD543x
-
-NAME Intel 5430
-SEE Cirrus Logic GD543x
-
-NAME STB Nitro (64)
-SEE Cirrus Logic GD543x
-
-NAME STB Nitro 64 Video
-SEE Cirrus Logic GD544x
-
-NAME STB Horizon
-SEE Cirrus Logic GD542x
-
-NAME STB Horizon Video
-SEE Cirrus Logic GD544x
-
-NAME Genoa 8500VL(-28)
-SEE Cirrus Logic GD542x
-
-NAME Diamond SpeedStar Pro (not SE)
-SEE Cirrus Logic GD542x
-
-NAME ALG-5434(E)
-SEE Cirrus Logic GD543x
-
-#tested
-NAME Acumos AVGA3
-SEE Cirrus Logic GD542x
-
-NAME DFI-WG1000
-SEE Cirrus Logic GD542x
-
-NAME VI720
-SEE Cirrus Logic GD543x
-
-NAME Cirrus Logic GD62xx (laptop)
-DRIVER vga
-
-NAME Cirrus Logic GD64xx (laptop)
+NAME Cirrus Logic GD6xxx / GD7xxx (laptop)
 DRIVER vga
 
-NAME Cirrus Logic GD754x (laptop)
-DRIVER vga
-
-NAME Techworks Ultimate 3D
-SEE Cirrus Logic GD5464
-
-NAME VideoLogic GrafixStar 550
-SEE Cirrus Logic GD5464
-
-NAME Jaton Video-70P
-SEE Cirrus Logic GD5464
-
 NAME PixelView Combo TV Pro (Prolink)
 DRIVER vga
 LINE # COMMENT on card TV Tuner
@@ -257,365 +157,52 @@ NAME PixelView Combo TV 3D AGP (Prolink)
 DRIVER vga
 LINE # COMMENT on card TV+FM Tuner
 
-NAME Creative Labs Graphics Blaster Eclipse (OEM Model CT6510)
-SEE Cirrus Logic GD5465
-
-NAME VideoLogic GrafixStar 560 (PCI/AGP)
-SEE Cirrus Logic GD5465
-
-NAME Cirrus Logic GD5446 (noname card)
-DRIVER vga
-
-# S3 801/805
-
-NAME S3 801/805 (generic)
-DRIVER s3
-NEEDVIDEORAM
-
-NAME S3 86C801 (generic)
-SEE S3 801/805 (generic)
-
-NAME S3 86C805 (generic)
-SEE S3 801/805 (generic)
-
-NAME Orchid Fahrenheit 1280
-DRIVER s3
-NEEDVIDEORAM
-LINE     #Probable clocks:
-LINE     #Clocks 25.20 28.32 32.50 0.00 40.00 44.90 50.40 65.00
-LINE     #Clocks 78.00 56.70 63.10 75.10 80.00 89.90 100.90 31.50
-
-NAME Miro Crystal 8S
-SEE S3 801/805 (generic)
-
-NAME Dell S3 805
-SEE S3 801/805 (generic)
-
-# S3 864/Trio64/Trio32/868
-
-NAME S3 864 (generic)
-DRIVER s3
-NEEDVIDEORAM
-
-NAME S3 86C864 (generic)
-SEE S3 864 (generic)
-
-NAME S3 Vision864 (generic)
-SEE S3 864 (generic)
-
-NAME S3 868 (generic)
-DRIVER s3
-NEEDVIDEORAM
-
-NAME S3 86C868 (generic)
-SEE S3 868 (generic)
-
-NAME S3 Vision868 (generic)
-SEE S3 868 (generic)
-
-NAME S3 868 with SDAC (86C716)
-DRIVER s3
-NEEDVIDEORAM
-
-NAME S3 Trio64 (generic)
-DRIVER s3
-NEEDVIDEORAM
-
-NAME S3 86C764 (Trio64)
-SEE S3 Trio64 (generic)
+# S3
 
-NAME S3 Trio64V+ (generic)
+NAME S3 8xx / 9xx / Trio-based cards
 DRIVER s3
 NEEDVIDEORAM
 
-NAME S3 86C765 (Trio64V+)
-SEE S3 Trio64V+ (generic)
-
-NAME S3 Trio32 (generic)
-DRIVER s3
-NEEDVIDEORAM
-
-NAME Number Nine GXE64 with S3 Trio64
-SEE S3 Trio64 (generic)
-
-NAME Diamond Stealth 64 DRAM with S3 Trio64
-SEE S3 Trio64 (generic)
-
-NAME Diamond Stealth64 Graphics 2xx0 series (Trio64)
-SEE S3 Trio64 (generic)
-
-NAME Diamond Stealth 64 DRAM SE
-SEE S3 Trio32 (generic)
-
-NAME Diamond Stealth64 Video 2001 series (2121/2201)
-SEE S3 Trio64V+ (generic)
-
-NAME Miro Crystal 12SD
-SEE S3 Trio32 (generic)
-
-NAME Miro Crystal 22SD
-SEE S3 Trio64 (generic)
-
-NAME Diamond Stealth Video DRAM
-SEE S3 868 with SDAC (86C716)
-
-NAME Diamond Stealth64 Video 2120/2200
-SEE S3 868 with SDAC (86C716)
-
-NAME Number Nine FX Vision 330
-SEE S3 Trio64 (generic)
-
-NAME Number Nine FX Motion 331
-SEE S3 Trio64V+ (generic)
-
-NAME ASUS Video Magic PCI V864
-SEE S3 864 (generic)
-
-NAME ASUS Video Magic PCI VT64
-SEE S3 Trio64 (generic)
-
-NAME VidTech FastMax P20
-SEE S3 864 (generic)
-
-NAME VideoLogic GrafixStar 500
-SEE S3 868 with SDAC (86C716)
-
-NAME VideoLogic GrafixStar 400
-SEE S3 Trio64V+ (generic)
-
-NAME VideoLogic GrafixStar 300
-SEE S3 Trio64 (generic)
-
-NAME 2 the Max MAXColor S3 Trio64V+
-SEE S3 Trio64V+ (generic)
-
-NAME DataExpert DSV3365
-SEE S3 Trio64V+ (generic)
-
-NAME ExpertColor DSV3365
-SEE S3 Trio64V+ (generic)
-
-NAME DSV3326
-SEE S3 Trio64V+ (generic)
-
-# S3 Trio64V2
-
-NAME S3 Trio64V2 (generic)
-DRIVER s3
-NEEDVIDEORAM
-
-NAME S3 Trio64V2/DX (generic)
-SEE S3 Trio64V2 (generic)
-
-NAME S3 Trio64V2/GX (generic)
-SEE S3 Trio64V2 (generic)
-
-NAME S3 86C775 (Trio64V2/DX)
-SEE S3 Trio64V2/DX (generic)
-
-NAME S3 86C785 (Trio64V2/GX)
-SEE S3 Trio64V2/GX (generic)
-
-NAME Elsa WINNER 1000/T2D
-SEE S3 Trio64V2/DX (generic)
-
-
-# S3 Aurora64V+
-
-NAME S3 Aurora64V+ (generic)
+NAME S3 Aurora64V+-based cards
 DRIVER s3
 NEEDVIDEORAM
 LINE     # Option "lcd_center"
 LINE     # Set_LCDClk  <pixel_clock_for_LCD>
 
-NAME S3 86CM65 (Aurora64V+)
-SEE S3 Aurora64V+ (generic)
-
-NAME SHARP 9080
-SEE S3 Aurora64V+ (generic)
-
-NAME SHARP 9090
-SEE S3 Aurora64V+ (generic)
-
-NAME Compaq Armada 7730MT
-SEE S3 Aurora64V+ (generic)
-
-NAME Compaq Armada 7380DMT
-SEE S3 Aurora64V+ (generic)
-
-
-# S3 964/968
-
-NAME S3 964 (generic)
-DRIVER s3
-NEEDVIDEORAM
-
-NAME S3 86C964 (generic)
-SEE S3 964 (generic)
-
-NAME S3 Vision964 (generic)
-SEE S3 964 (generic)
-
-NAME S3 968 (generic)
-DRIVER s3
-NEEDVIDEORAM
-
-NAME S3 86C968 (generic)
-SEE S3 968 (generic)
-
-NAME S3 Vision968 (generic)
-SEE S3 968 (generic)
-
-NAME Diamond Stealth64 Video 3200
-LINE    #Option "slow_vram"
-SEE S3 968 (generic)
-
 NAME Genoa VideoBlitz III AV
 LINE    #s3RefClk  50
 LINE    #DACspeed 170
-SEE S3 968 (generic)
+SEE S3 8xx / 9xx / Trio-based cards
 
 NAME STB Velocity 64 Video
 LINE    #s3RefClk  24
 LINE    #DACspeed 220
-SEE S3 968 (generic)
-
-NAME STB Powergraph 64 Video
-SEE S3 Trio64V+ (generic)
-
-NAME STB Powergraph 64
-SEE S3 Trio64 (generic)
-
-NAME Elsa Winner 1000TRIO
-SEE S3 Trio64 (generic)
-
-NAME Elsa Winner 1000TRIO/V
-SEE S3 Trio64V+ (generic)
-
-NAME Hercules Graphite Terminator 64
-LINE     Option "slow_vram"
-LINE    #s3RefClk  50
-LINE    #DACspeed 170
-SEE S3 964 (generic)
-
-NAME Hercules Terminator 64/Video
-SEE S3 Trio64V+ (generic)
-
-NAME Hercules Graphite Terminator 64/DRAM
-SEE S3 Trio64 (generic)
+SEE S3 8xx / 9xx / Trio-based cards
 
 NAME Hercules Graphite Terminator Pro 64
 LINE    #s3RefClk  16
 LINE    #DACspeed 220
-SEE S3 968 (generic)
+SEE S3 8xx / 9xx / Trio-based cards
 
 NAME Number Nine FX Motion 771
 LINE    #s3RefClk  16
-SEE S3 968 (generic)
+SEE S3 8xx / 9xx / Trio-based cards
 
-NAME Miro Crystal 80SV
-DRIVER s3
-NEEDVIDEORAM
-
-NAME Elsa Winner 2000PRO-2
+NAME Elsa Winner 2000PRO-2 / 2000PRO-4
 DRIVER s3
 NEEDVIDEORAM
 LINE     #Option "ELSA_w2000pro"
 
-NAME Elsa Winner 2000PRO-4
-DRIVER s3
-NEEDVIDEORAM
-LINE     #Option "ELSA_w2000pro"
-
-NAME Elsa Winner 2000PRO/X-2
-DRIVER s3
-NEEDVIDEORAM
-LINE     #Option "sync_on_green"
-
-NAME Elsa Winner 2000PRO/X-4
-DRIVER s3
-NEEDVIDEORAM
-LINE     #Option "sync_on_green"
-
-NAME Elsa Winner 2000PRO/X-8
-DRIVER s3
-NEEDVIDEORAM
-LINE     #Option "sync_on_green"
-
-NAME Elsa Winner 2000AVI
-DRIVER s3
-NEEDVIDEORAM
-LINE     #Option "sync_on_green"
-
-NAME Elsa Gloria-4
+NAME Elsa Winner 2000PROX-2 / X-4 / X-8 / AVI
 DRIVER s3
 NEEDVIDEORAM
 LINE     #Option "sync_on_green"
 
-NAME Elsa Gloria-8
+NAME Elsa Gloria-4 / Gloria-8
 DRIVER s3
 NEEDVIDEORAM
 LINE     #Option "sync_on_green"
 
-NAME VideoLogic GrafixStar 700
-DRIVER s3
-NEEDVIDEORAM
-
-NAME Leadtek WinFast S430
-DRIVER s3
-NEEDVIDEORAM
-
-NAME WinFast S430
-SEE Leadtek WinFast S430
-
-NAME Leadtek WinFast S510
-DRIVER s3
-NEEDVIDEORAM
-
-NAME WinFast S510
-SEE Leadtek WinFast S510
-
-# S3 928
-
-NAME S3 928 (generic)
-DRIVER s3
-NEEDVIDEORAM
-
-NAME S3 86C928 (generic)
-SEE S3 928 (generic)
-
-NAME Elsa Winner 1000VL
-DRIVER s3
-NEEDVIDEORAM
-LINE     # the following settings should be detected and set automatically by XF86_S3
-LINE     # if the serial number of the Elsa card is printed correctly:
-LINE     #ClockChip "icd2061a"
-LINE     #Membase 0xf8000000
-
-NAME Elsa Winner 1000TwinBus
-SEE Elsa Winner 1000VL
-
-NAME Elsa Winner 2000
-SEE S3 928 (generic)
-
-NAME Miro Crystal 16S
-SEE S3 928 (generic)
-
-# S3 911/924
-
-NAME S3 911/924 (generic)
-DRIVER s3
-NEEDVIDEORAM
-
-NAME S3 86C911 (generic)
-SEE S3 911/924 (generic)
-
-NAME S3 86C924 (generic)
-SEE S3 911/924 (generic)
-
-#NAME Orchid Fahrenheit 1280
-#SEE S3 911/924 (generic)
-
 NAME S3 924 with SC1148 DAC
 DRIVER s3
 NEEDVIDEORAM
@@ -623,29 +210,7 @@ LINE     #Probable clocks:
 LINE     #Clocks 25.2 28.3 39.7 1.7 49.9 76.7 35.7 44
 LINE     #Clocks 130.2 119.5 79.4 31.2 110.0 65.2 74.9 71.3
 
-# S3 ViRGE,/DX,/GX and ViRGE/VX
-
-NAME S3 ViRGE (old S3V server)
-DRIVER s3virge
-NEEDVIDEORAM
-
-NAME S3 ViRGE (generic)
-DRIVER s3virge
-NEEDVIDEORAM
-LINE      #Option "xaa_benchmark"
-LINE      #Option "fifo_moderate"
-LINE      #Option "pci_burst_on"
-LINE      #Option "pci_retry"
-
-NAME S3 ViRGE/DX (generic)
-DRIVER s3virge
-NEEDVIDEORAM
-LINE      #Option "xaa_benchmark"
-LINE      #Option "fifo_moderate"
-LINE      #Option "pci_burst_on"
-LINE      #Option "pci_retry"
-
-NAME S3 ViRGE/GX (generic)
+NAME S3 ViRGE-based cards
 DRIVER s3virge
 NEEDVIDEORAM
 LINE      #Option "xaa_benchmark"
@@ -653,16 +218,7 @@ LINE      #Option "fifo_moderate"
 LINE      #Option "pci_burst_on"
 LINE      #Option "pci_retry"
 
-
-NAME S3 ViRGE/GX2 (generic)
-DRIVER s3virge
-NEEDVIDEORAM
-LINE      #Option "xaa_benchmark"
-LINE      #Option "fifo_moderate"
-LINE      #Option "pci_burst_on"
-LINE      #Option "pci_retry"
-
-NAME S3 ViRGE/MX (generic)
+NAME S3 ViRGE/MX-based cards
 DRIVER s3virge
 NEEDVIDEORAM
 LINE      #Option "lcd_center"
@@ -672,251 +228,20 @@ LINE      #Option "fifo_moderate"
 LINE      #Option "pci_burst_on"
 LINE      #Option "pci_retry"
 
-NAME S3 ViRGE/MX+ (generic)
-SEE S3 ViRGE/MX (generic)
-
-NAME S3 Trio3D
+NAME S3 Trio3D-based cards
 DRIVER s3virge
 LINE Option "sw_cursor"
 
-NAME S3 86C365 (Trio3D)
-SEE S3 Trio3D
-
-NAME Elsa Winner T3D
-SEE S3 Trio3D
-
-NAME Hercules Terminator 128/3D
-SEE S3 Trio3D
-
-NAME AOpen PG128
-SEE S3 Trio3D
-
-NAME S3 86C368 (Trio3D/2X)
-NEEDVIDEORAM
-LINE      # Option "no_accel"	# You may enable this if there are timeouts when starting X
-SEE S3 Trio3D
-
-NAME S3 Trio3D/2X
-LINE      # Option "no_accel"	# You may enable this if there are timeouts when starting X
-SEE S3 Trio3D
-
-NAME S3 86C325 (ViRGE)
-SEE S3 ViRGE (generic)
-
-NAME S3 86C375 (ViRGE/DX)
-SEE S3 ViRGE/DX (generic)
-
-NAME S3 86C385 (ViRGE/GX)
-SEE S3 ViRGE/GX (generic)
-
-NAME S3 86C357 (ViRGE/GX2)
-SEE S3 ViRGE/GX2 (generic)
-
-NAME S3 86C260 (ViRGE/MX)
-SEE S3 ViRGE/MX (generic)
-
-NAME S3 86C280 (ViRGE/MX+)
-SEE S3 ViRGE/MX+ (generic)
-
-
-NAME Elsa Victory 3D
-SEE S3 ViRGE (generic)
-
-NAME Elsa Victory 3DX
-SEE S3 ViRGE/DX (generic)
-
-NAME Elsa Winner 3000-S
-SEE S3 ViRGE (generic)
-
-NAME Number Nine Visual 9FX Reality 332
-SEE S3 ViRGE (generic)
-
-NAME Number Nine FX Motion 332
-SEE S3 ViRGE (generic)
-
-NAME Diamond Stealth 3D 2000
-SEE S3 ViRGE (generic)
-
-NAME Diamond Stealth 3D 2000 PRO
-SEE S3 ViRGE/DX (generic)
-
-NAME Diamond Multimedia Stealth 3D 2000
-SEE S3 ViRGE (generic)
-
-NAME Diamond Multimedia Stealth 3D 2000 PRO
-SEE S3 ViRGE/DX (generic)
-
-NAME DataExpert DSV3325
-SEE S3 ViRGE (generic)
-
-NAME ExpertColor DSV3325
-SEE S3 ViRGE (generic)
-
-NAME DSV3325
-SEE S3 ViRGE (generic)
-
-NAME Hercules Terminator 64/3D
-SEE S3 ViRGE (generic)
-
-NAME Hercules Terminator 3D/DX
-SEE S3 ViRGE/DX (generic)
-
-NAME AOpen PT70
-SEE S3 ViRGE/DX (generic)
-
-NAME AOpen PT75
-SEE S3 ViRGE/DX (generic)
-
-NAME Leadtek WinFast 3D S600
-SEE S3 ViRGE (generic)
-
-NAME WinFast 3D S600
-SEE Leadtek WinFast 3D S600
-
-NAME Leadtek WinFast 3D S680
-SEE S3 ViRGE/GX2 (generic)
-
-NAME Miro MiroMedia 3D
-SEE S3 ViRGE (generic)
-
-NAME Orchid Technology Fahrenheit Video 3D
-SEE S3 ViRGE (generic)
-
-NAME STB Systems Powergraph 3D
-SEE S3 ViRGE (generic)
-
-NAME STB Nitro 3D
-SEE S3 ViRGE/GX (generic)
-
 NAME MELCO WGP-VG4S
 LINE      #DACSpeed  191 162 111 83
 LINE      #SetMClck  75
-SEE S3 ViRGE (generic)
-
-
-
-NAME S3 ViRGE/VX (generic)
-DRIVER s3virge
-NEEDVIDEORAM
-LINE      #Option "xaa_benchmark"
-LINE      #Option "fifo_moderate"
-LINE      #Option "pci_burst_on"
-LINE      #Option "pci_retry"
-
-
-NAME S3 86C988 (ViRGE/VX)
-SEE S3 ViRGE/VX (generic)
+SEE S3 ViRGE-based cards
 
-NAME Elsa Winner 3000
-SEE S3 ViRGE/VX (generic)
-
-NAME Elsa Winner 3000-M-22
-SEE S3 ViRGE/VX (generic)
-
-NAME Elsa Winner 3000-L-42
-SEE S3 ViRGE/VX (generic)
-
-NAME Elsa Winner 2000AVI/3D
-SEE S3 ViRGE/VX (generic)
-
-NAME Diamond Stealth 3D 3000
-SEE S3 ViRGE/VX (generic)
-
-NAME STB Systems Velocity 3D
-SEE S3 ViRGE/VX (generic)
-
-NAME MELCO WGP-VX8
-SEE S3 ViRGE/VX (generic)
-
-NAME Number Nine FX Reality 772
-SEE S3 ViRGE/VX (generic)
-
-NAME Diamond Stealth 3D 4000
-SEE S3 ViRGE/GX2 (generic)
-
-NAME Toshiba Tecra 750CDT
-SEE S3 ViRGE/MX (generic)
-
-NAME Toshiba Tecra 750DVD
-SEE S3 ViRGE/MX (generic)
-
-NAME Toshiba Tecra 540CDT
-SEE S3 ViRGE/MX (generic)
-
-NAME Toshiba Tecra 550CDT
-SEE S3 ViRGE/MX (generic)
-
-# currently unsupported S3
-
-NAME Toshiba Satellite 2050 CDS
-SEE S3 ViRGE/MX (generic)
-
-NAME Toshiba Satellite 2520 CDS
-SEE S3 ViRGE/MX (generic)
-
-NAME Compaq Armada 7400
-SEE S3 ViRGE/MX (generic)
-
-NAME Compaq Armada 7800
-SEE S3 ViRGE/MX (generic)
-
-
-NAME S3 Savage (generic)
+NAME S3 Savage-based cards
 DRIVER savage
 NEEDVIDEORAM
 LINE      #Option "xaa_benchmark"
 
-# see bug #730
-NAME S3 Savage (generic, sw_cursor)
-SEE S3 Savage (generic)
-LINE Option "sw_cursor"
-LINE Option "ForceInit"
-
-NAME S3 86C390 (Savage3D)
-SEE S3 Savage (generic)
-
-NAME S3 86C391 (Savage3D)
-SEE S3 Savage (generic)
-
-NAME S3 Savage3D
-SEE S3 Savage (generic)
-
-NAME Aristo ART-390-G  S3 Savage3D
-SEE S3 Savage (generic)
-
-
-NAME S3 Savage4 (generic)
-LINE      # Option "no_accel"	# You may enable this if there are timeouts when starting X
-SEE S3 Savage (generic)
-
-NAME S3 86C395 (Savage4 Pro+)
-SEE S3 Savage4 (generic)
-
-NAME S3 86C396 (Savage4)
-SEE S3 Savage4 (generic)
-
-NAME S3 86C397 (Savage4)
-SEE S3 Savage4 (generic)
-
-NAME S3 Savage4
-SEE S3 Savage4 (generic)
-
-NAME S3 Savage4 Pro+
-SEE S3 Savage4 (generic)
-
-NAME Diamond Stealth III (S520/S540)
-SEE S3 Savage4 (generic)
-
-NAME Creative Labs Savage 4  3D Blaster
-SEE S3 Savage4 (generic)
-
-NAME S3 Savage2000 (generic)
-DRIVER savage
-NEEDVIDEORAM
-
-NAME S3 Savage/MX
-SEE S3 Savage4 (generic)
-
 # S3 UniChrome (via)
 
 NAME S3 UniChrome
diff --git a/lst/pcitable b/lst/pcitable
index 27224336..a73d7d09 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -910,33 +910,33 @@
 0x1011	0x4051	"cpqarray"	"Digital Equipment Corp.|Integrated Smart Array"
 0x1011	0x4058	"cpqarray"	"Digital Equipment Corp.|Integrated Smart Array"
 0x1011	0x9005	"aacraid"	"Digital Equipment Corp.|5400S"
-0x1013	0x0038	"Card:Cirrus Logic GD754x (laptop)"	"Cirrus Logic|GD 7548"
-0x1013	0x0040	"Card:Cirrus Logic GD754x (laptop)"	"Cirrus Logic|GD7555 Flat Panel GUI Accelerator"
+0x1013	0x0038	"Card:Cirrus Logic GD6xxx / GD7xxx (laptop)"	"Cirrus Logic|GD 7548"
+0x1013	0x0040	"Card:Cirrus Logic GD6xxx / GD7xxx (laptop)"	"Cirrus Logic|GD7555 Flat Panel GUI Accelerator"
 0x1013	0x0045	"unknown"	"Cirrus Logic|A CL-MD5620DT-QC-B WINCOM V9.0 56K"
-0x1013	0x004c	"Card:Cirrus Logic GD754x (laptop)"	"Cirrus Logic|GD7556 Video/Graphics LCD/CRT Ctrlr"
-0x1013	0x00a0	"Card:Cirrus Logic GD543x"	"Cirrus Logic|GD 5430/40 [Alpine]"
-0x1013	0x00a2	"Card:Cirrus Logic GD543x"	"Cirrus Logic|GD 5432 [Alpine]"
-0x1013	0x00a4	"Card:Cirrus Logic GD543x"	"Cirrus Logic|GD 5434-4 [Alpine]"
-0x1013	0x00a8	"Card:Cirrus Logic GD543x"	"Cirrus Logic|GD 5434-8 [Alpine]"
-0x1013	0x00ac	"Card:Cirrus Logic GD543x"	"Cirrus Logic|GD 5436 [Alpine]"
-0x1013	0x00b0	"Card:Cirrus Logic GD544x"	"Cirrus Logic|GD 5440"
-0x1013	0x00b8	"Card:Cirrus Logic GD544x"	"Cirrus Logic|GD 5446"
+0x1013	0x004c	"Card:Cirrus Logic GD6xxx / GD7xxx (laptop)"	"Cirrus Logic|GD7556 Video/Graphics LCD/CRT Ctrlr"
+0x1013	0x00a0	"Card:Cirrus Logic GD543x-based cards"	"Cirrus Logic|GD 5430/40 [Alpine]"
+0x1013	0x00a2	"Card:Cirrus Logic GD543x-based cards"	"Cirrus Logic|GD 5432 [Alpine]"
+0x1013	0x00a4	"Card:Cirrus Logic GD543x-based cards"	"Cirrus Logic|GD 5434-4 [Alpine]"
+0x1013	0x00a8	"Card:Cirrus Logic GD543x-based cards"	"Cirrus Logic|GD 5434-8 [Alpine]"
+0x1013	0x00ac	"Card:Cirrus Logic GD543x-based cards"	"Cirrus Logic|GD 5436 [Alpine]"
+0x1013	0x00b0	"Card:Cirrus Logic GD544x-based cards"	"Cirrus Logic|GD 5440"
+0x1013	0x00b8	"Card:Cirrus Logic GD544x-based cards"	"Cirrus Logic|GD 5446"
 0x1013	0x00bc	"Card:Cirrus Logic GD5480"	"Cirrus Logic|GD 5480"
-0x1013	0x00d0	"Card:Cirrus Logic GD5462"	"Cirrus Logic|GD 5462"
-0x1013	0x00d2	"Card:Cirrus Logic GD5462"	"Cirrus Logic|GD 5462 [Laguna I]"
-0x1013	0x00d4	"Card:Cirrus Logic GD5464"	"Cirrus Logic|GD 5464 [Laguna]"
-0x1013	0x00d5	"Card:Cirrus Logic GD5464"	"Cirrus Logic|GD5464BD"
-0x1013	0x00d6	"Card:Cirrus Logic GD5465"	"Cirrus Logic|GD 5465 [Laguna]"
-0x1013	0x00e8	"Card:Cirrus Logic GD543x"	"Cirrus Logic|GD 5436U"
+0x1013	0x00d0	"Card:Cirrus Logic GD546x-based cards"	"Cirrus Logic|GD 5462"
+0x1013	0x00d2	"Card:Cirrus Logic GD546x-based cards"	"Cirrus Logic|GD 5462 [Laguna I]"
+0x1013	0x00d4	"Card:Cirrus Logic GD546x-based cards"	"Cirrus Logic|GD 5464 [Laguna]"
+0x1013	0x00d5	"Card:Cirrus Logic GD546x-based cards"	"Cirrus Logic|GD5464BD"
+0x1013	0x00d6	"Card:Cirrus Logic GD546x-based cards"	"Cirrus Logic|GD 5465 [Laguna]"
+0x1013	0x00e8	"Card:Cirrus Logic GD543x-based cards"	"Cirrus Logic|GD 5436U"
 0x1013	0x1010	"cs46xx"	"Cirrus Logic|CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator]"
 0x1013	0x1014	"cs46xx"	"Cirrus Logic|CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator]"
 0x1013	0x1100	"pd6729"	"Cirrus Logic|CL 6729"
 0x1013	0x1110	"yenta_socket"	"Cirrus Logic|PD 6832"
 0x1013	0x1112	"yenta_socket"	"Cirrus Logic|PD 6834 PCMCIA/CardBus Ctrlr"
 0x1013	0x1113	"yenta_socket"	"Cirrus Logic|PD 6833 PCMCIA/CardBus Ctrlr"
-0x1013	0x1200	"Card:Cirrus Logic GD754x (laptop)"	"Cirrus Logic|GD 7542 [Nordic]"
-0x1013	0x1202	"Card:Cirrus Logic GD754x (laptop)"	"Cirrus Logic|GD 7543 [Viking]"
-0x1013	0x1204	"Card:Cirrus Logic GD754x (laptop)"	"Cirrus Logic|GD 7541 [Nordic Light]"
+0x1013	0x1200	"Card:Cirrus Logic GD6xxx / GD7xxx (laptop)"	"Cirrus Logic|GD 7542 [Nordic]"
+0x1013	0x1202	"Card:Cirrus Logic GD6xxx / GD7xxx (laptop)"	"Cirrus Logic|GD 7543 [Viking]"
+0x1013	0x1204	"Card:Cirrus Logic GD6xxx / GD7xxx (laptop)"	"Cirrus Logic|GD 7541 [Nordic Light]"
 0x1013	0x4000	"unknown"	"Cirrus Logic|MD 5620 [CLM Data Fax Voice]"
 0x1013	0x4400	"unknown"	"Cirrus Logic|CD 4400"
 0x1013	0x6001	"cs46xx"	"Cirrus Logic|Cirrus CS4610/1 CrystalClear SoundFusion Audio"
@@ -2318,26 +2318,26 @@
 0x1091	0x0720	"unknown"	"Intergraph Corp.|Motion JPEG codec"
 0x1091	0x07a0	"unknown"	"Intergraph Corp.|Sun Expert3D-Lite Graphics Accelerator"
 0x1091	0x1091	"unknown"	"Intergraph Corp.|Sun Expert3D Graphics Accelerator"
-0x1092	0x00a0	"Card:Diamond SpeedStar Pro SE (CL-GD5430/5434)"	"Diamond Multimedia Systems|Speedstar Pro SE"
-0x1092	0x00a8	"Card:Diamond SpeedStar 64"	"Diamond Multimedia Systems|Speedstar 64"
+0x1092	0x00a0	"Card:Cirrus Logic GD543x-based cards"	"Diamond Multimedia Systems|Speedstar Pro SE"
+0x1092	0x00a8	"Card:Cirrus Logic GD543x-based cards"	"Diamond Multimedia Systems|Speedstar 64"
 0x1092	0x0550	"Card:NVIDIA RIVA TNT to GeForce 2 (71xx)"	"Diamond Multimedia Systems||Viper 550"
 0x1092	0x08d4	"unknown"	"Diamond Multimedia Systems|Supra 2260 Modem"
 0x1092	0x094c	"unknown"	"Diamond Multimedia Systems|SupraExpress 56i Pro"
 0x1092	0x09c8	"unknown"	"Diamond Computer Systems|SUP2760 SupraExpress 56i Pro VCC"
 0x1092	0x1092	"Card:NVIDIA RIVA TNT to GeForce 2 (71xx)"	"Diamond Multimedia Systems|Viper V330"
 0x1092	0x6120	"unknown"	"Diamond Multimedia Systems|Maximum DVD"
-0x1092	0x8810	"Card:Diamond Stealth 64 DRAM SE"	"Diamond Multimedia Systems|Stealth SE"
-0x1092	0x8811	"Card:Diamond Stealth 64 DRAM SE"	"Diamond Multimedia Systems|Stealth 64/SE"
-0x1092	0x8880	"Card:Diamond Stealth 64 DRAM SE"	"Diamond Multimedia Systems|Stealth"
-0x1092	0x8881	"Card:Diamond Stealth 64 DRAM SE"	"Diamond Multimedia Systems|Stealth"
-0x1092	0x88b0	"Card:Diamond Stealth 64 DRAM SE"	"Diamond Multimedia Systems|Stealth 64"
-0x1092	0x88b1	"Card:Diamond Stealth 64 DRAM SE"	"Diamond Multimedia Systems|Stealth 64"
-0x1092	0x88c0	"Card:Diamond Stealth 64 DRAM SE"	"Diamond Multimedia Systems|Stealth 64"
-0x1092	0x88c1	"Card:Diamond Stealth 64 DRAM SE"	"Diamond Multimedia Systems|Stealth 64"
-0x1092	0x88d0	"Card:Diamond Stealth 64 DRAM SE"	"Diamond Multimedia Systems|Stealth 64"
-0x1092	0x88d1	"Card:Diamond Stealth 64 DRAM SE"	"Diamond Multimedia Systems|Stealth 64"
-0x1092	0x88f0	"Card:Diamond Stealth 64 DRAM SE"	"Diamond Multimedia Systems|Stealth 64"
-0x1092	0x88f1	"Card:Diamond Stealth 64 DRAM SE"	"Diamond Multimedia Systems|Stealth 64"
+0x1092	0x8810	"Card:S3 8xx / 9xx / Trio-based cards"	"Diamond Multimedia Systems|Stealth SE"
+0x1092	0x8811	"Card:S3 8xx / 9xx / Trio-based cards"	"Diamond Multimedia Systems|Stealth 64/SE"
+0x1092	0x8880	"Card:S3 8xx / 9xx / Trio-based cards"	"Diamond Multimedia Systems|Stealth"
+0x1092	0x8881	"Card:S3 8xx / 9xx / Trio-based cards"	"Diamond Multimedia Systems|Stealth"
+0x1092	0x88b0	"Card:S3 8xx / 9xx / Trio-based cards"	"Diamond Multimedia Systems|Stealth 64"
+0x1092	0x88b1	"Card:S3 8xx / 9xx / Trio-based cards"	"Diamond Multimedia Systems|Stealth 64"
+0x1092	0x88c0	"Card:S3 8xx / 9xx / Trio-based cards"	"Diamond Multimedia Systems|Stealth 64"
+0x1092	0x88c1	"Card:S3 8xx / 9xx / Trio-based cards"	"Diamond Multimedia Systems|Stealth 64"
+0x1092	0x88d0	"Card:S3 8xx / 9xx / Trio-based cards"	"Diamond Multimedia Systems|Stealth 64"
+0x1092	0x88d1	"Card:S3 8xx / 9xx / Trio-based cards"	"Diamond Multimedia Systems|Stealth 64"
+0x1092	0x88f0	"Card:S3 8xx / 9xx / Trio-based cards"	"Diamond Multimedia Systems|Stealth 64"
+0x1092	0x88f1	"Card:S3 8xx / 9xx / Trio-based cards"	"Diamond Multimedia Systems|Stealth 64"
 0x1092	0x9876	"unknown"	"Diamond Multimedia Systems|Supra Express 56i Pro CW #2"
 0x1092	0x9999	"unknown"	"Diamond Multimedia Systems|DMD-I0928-1 Monster sound sound chip"
 0x1093	0x0160	"unknown"	"National Instruments|PCI-DIO-96"
@@ -2466,7 +2466,7 @@
 0x10a5	0x3052	"slamr"	"Smart Link Ltd.|SmartPCI562 56K Modem"
 0x10a5	0x5449	"unknown"	"Smart Link Ltd.|SmartPCI561 modem"
 0x10a5	0x5459	"slamr"	"Smart Link Ltd.|modem"
-0x10a8	0x0000	"Card:STB Horizon"	"Sierra Semiconductor|STB Horizon 64"
+0x10a8	0x0000	"Card:Cirrus Logic GD542x-based cards"	"Sierra Semiconductor|STB Horizon 64"
 0x10a9	0x0001	"unknown"	"Silicon Graphics Inc.|Crosstalk to PCI Bridge"
 0x10a9	0x0002	"unknown"	"Silicon Graphics Inc.|Linc I/O controller"
 0x10a9	0x0003	"8250_pci"	"Silicon Graphics Inc.|IOC3"
@@ -6653,88 +6653,88 @@
 0x5168	0x0301	"unknown"	"Animation Technologies Inc.|FlyDVB-T"
 0x5213	0x0510	"snd-fm801"	"Gallant|Odyssey Sound 4"
 0x5301	0x0001	"Card:AT3D"	"Alliance Semiconductor|ProMotion aT3D"
-0x5333	0x0551	"Card:S3 Trio3D"	"S3 Inc.|Plato/PX (system)"
+0x5333	0x0551	"Card:S3 Trio3D-based cards"	"S3 Inc.|Plato/PX (system)"
 0x5333	0x0e11	"Card:VESA driver (generic)"	"S3 Inc.|86c775/86c785 [Trio 64V2/DX or /GX]"
-0x5333	0x5631	"Card:S3 ViRGE (generic)"	"S3 Inc.|86c325 [ViRGE]"
-0x5333	0x8800	"unknown"	"S3 Inc.|86c866 [Vision 866]"
-0x5333	0x8801	"Card:S3 Vision964 (generic)"	"S3 Inc.|86c964 [Vision 964]"
-0x5333	0x8810	"Card:S3 Trio32 (generic)"	"S3 Inc.|86c764_0 [Trio 32 vers 0]"
-0x5333	0x8811	"Card:S3 Trio64 (generic)"	"S3 Inc.|86c764/765 [Trio32/64/64V+]"
-0x5333	0x8812	"Card:S3 Aurora64V+ (generic)"	"S3 Inc.|86cM65 [Aurora64V+]"
-0x5333	0x8813	"Card:S3 Trio64 (generic)"	"S3 Inc.|86c764_3 [Trio 32/64 vers 3]"
-0x5333	0x8814	"Card:S3 Trio64V+ (generic)"	"S3 Inc.|86c767 [Trio 64UV+]"
-0x5333	0x8815	"Card:S3 Aurora64V+ (generic)"	"S3 Inc.|86cM65 [Aurora 128]"
-0x5333	0x883d	"Card:S3 ViRGE (generic)"	"S3 Inc.|86c988 [ViRGE/VX]"
+0x5333	0x5631	"Card:S3 ViRGE-based cards"	"S3 Inc.|86c325 [ViRGE]"
+0x5333	0x8800	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c866 [Vision 866]"
+0x5333	0x8801	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c964 [Vision 964]"
+0x5333	0x8810	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c764_0 [Trio 32 vers 0]"
+0x5333	0x8811	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c764/765 [Trio32/64/64V+]"
+0x5333	0x8812	"Card:S3 Aurora64V+-based cards"	"S3 Inc.|86cM65 [Aurora64V+]"
+0x5333	0x8813	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c764_3 [Trio 32/64 vers 3]"
+0x5333	0x8814	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c767 [Trio 64UV+]"
+0x5333	0x8815	"Card:S3 Aurora64V+-based cards"	"S3 Inc.|86cM65 [Aurora 128]"
+0x5333	0x883d	"Card:S3 ViRGE-based cards"	"S3 Inc.|86c988 [ViRGE/VX]"
 0x5333	0x8870	"unknown"	"S3 Inc.|FireGL"
-0x5333	0x8880	"Card:S3 868 (generic)"	"S3 Inc.|86c868 [Vision 868 VRAM] vers 0"
-0x5333	0x8881	"Card:S3 868 (generic)"	"S3 Inc.|86c868 [Vision 868 VRAM] vers 1"
-0x5333	0x8882	"Card:S3 868 (generic)"	"S3 Inc.|86c868 [Vision 868 VRAM] vers 2"
-0x5333	0x8883	"Card:S3 868 (generic)"	"S3 Inc.|86c868 [Vision 868 VRAM] vers 3"
-0x5333	0x88b0	"Card:S3 928 (generic)"	"S3 Inc.|86c928 [Vision 928 VRAM] vers 0"
-0x5333	0x88b1	"Card:S3 86C928 (generic)"	"S3 Inc.|86c928 [Vision 928 VRAM] vers 1"
-0x5333	0x88b2	"Card:S3 86C928 (generic)"	"S3 Inc.|86c928 [Vision 928 VRAM] vers 2"
-0x5333	0x88b3	"Card:S3 86C928 (generic)"	"S3 Inc.|86c928 [Vision 928 VRAM] vers 3"
-0x5333	0x88c0	"Card:S3 864 (generic)"	"S3 Inc.|86c864 [Vision 864 DRAM] vers 0"
-0x5333	0x88c1	"Card:S3 864 (generic)"	"S3 Inc.|86c864 [Vision 864 DRAM] vers 1"
-0x5333	0x88c2	"Card:S3 864 (generic)"	"S3 Inc.|86c864 [Vision 864-P DRAM] vers 2"
-0x5333	0x88c3	"Card:S3 864 (generic)"	"S3 Inc.|86c864 [Vision 864-P DRAM] vers 3"
-0x5333	0x88d0	"Card:S3 964 (generic)"	"S3 Inc.|86c964 [Vision 964 VRAM] vers 0"
-0x5333	0x88d1	"Card:S3 964 (generic)"	"S3 Inc.|86c964 [Vision 964 VRAM] vers 1"
-0x5333	0x88d2	"Card:S3 964 (generic)"	"S3 Inc.|86c964 [Vision 964-P VRAM] vers 2"
-0x5333	0x88d3	"Card:S3 964 (generic)"	"S3 Inc.|86c964 [Vision 964-P VRAM] vers 3"
-0x5333	0x88f0	"Card:S3 968 (generic)"	"S3 Inc.|86c968 [Vision 968 VRAM] rev 0"
-0x5333	0x88f1	"Card:S3 968 (generic)"	"S3 Inc.|86c968 [Vision 968 VRAM] rev 1"
-0x5333	0x88f2	"Card:S3 968 (generic)"	"S3 Inc.|86c968 [Vision 968 VRAM] rev 2"
-0x5333	0x88f3	"Card:S3 968 (generic)"	"S3 Inc.|86c968 [Vision 968 VRAM] rev 3"
-0x5333	0x8900	"Card:S3 Trio64V2 (generic)"	"S3 Inc.|86c755 [Trio 64V2/DX]"
-0x5333	0x8901	"Card:S3 Trio64V2 (generic)"	"S3 Inc.|Trio 64V2/DX or /GX"
-0x5333	0x8902	"Card:S3 Trio3D"	"S3 Inc.|Plato/PX (graphics)"
-0x5333	0x8903	"Card:S3 Trio3D"	"S3 Inc.|Trio 3D business multimedia"
-0x5333	0x8904	"Card:S3 Trio3D"	"S3 Inc.|Trio 64 3D"
-0x5333	0x8905	"Card:S3 Trio64V+ (generic)"	"S3 Inc.|Trio 64V+ family"
-0x5333	0x8906	"Card:S3 Trio64V+ (generic)"	"S3 Inc.|Trio 64V+ family"
-0x5333	0x8907	"Card:S3 Trio64V+ (generic)"	"S3 Inc.|Trio 64V+ family"
-0x5333	0x8908	"Card:S3 Trio64V+ (generic)"	"S3 Inc.|Trio 64V+ family"
-0x5333	0x8909	"Card:S3 Trio64V+ (generic)"	"S3 Inc.|Trio 64V+ family"
-0x5333	0x890a	"Card:S3 Trio64V+ (generic)"	"S3 Inc.|Trio 64V+ family"
-0x5333	0x890b	"Card:S3 Trio64V+ (generic)"	"S3 Inc.|Trio 64V+ family"
-0x5333	0x890c	"Card:S3 Trio64V+ (generic)"	"S3 Inc.|Trio 64V+ family"
-0x5333	0x890d	"Card:S3 Trio64V+ (generic)"	"S3 Inc.|Trio 64V+ family"
-0x5333	0x890e	"Card:S3 Trio64V+ (generic)"	"S3 Inc.|Trio 64V+ family"
-0x5333	0x890f	"Card:S3 Trio64V+ (generic)"	"S3 Inc.|Trio 64V+ family"
-0x5333	0x8a01	"Card:S3 ViRGE (generic)"	"S3 Inc.|ViRGE/DX or /GX"
-0x5333	0x8a10	"Card:S3 ViRGE/GX2 (generic)"	"S3 Inc.|ViRGE/GX2"
-0x5333	0x8a11	"unknown"	"S3 Incorporated|86C359 ViRGE /GX2+ Macrovision"
-0x5333	0x8a12	"unknown"	"S3 Incorporated|86C359 ViRGE /GX2+"
-0x5333	0x8a13	"Card:S3 86C368 (Trio3D/2X)"	"S3 Inc.|86c368 [Trio 3D/2X]"
-0x5333	0x8a20	"Card:S3 Savage3D"	"S3 Inc.|86c794 [Savage 3D]"
-0x5333	0x8a21	"Card:S3 Savage3D"	"S3 Inc.|86c795 [Savage 3D/MV]"
-0x5333	0x8a22	"Card:S3 Savage4"	"S3 Inc.|Savage 4"
-0x5333	0x8a23	"Card:S3 Savage4"	"S3 Inc.|Savage 4"
-0x5333	0x8a25	"Card:S3 Savage4"	"S3 Inc.|ProSavage PM133"
-0x5333	0x8a26	"Card:S3 Savage4"	"S3 Inc.|ProSavage KM133"
-0x5333	0x8c00	"Card:S3 ViRGE/MX (generic)"	"S3 Inc.|ViRGE/M3"
-0x5333	0x8c01	"Card:S3 ViRGE/MX (generic)"	"S3 Inc.|ViRGE/MX"
-0x5333	0x8c02	"Card:S3 ViRGE/MX+ (generic)"	"S3 Inc.|ViRGE/MX+"
-0x5333	0x8c03	"Card:S3 ViRGE/MX (generic)"	"S3 Inc.|ViRGE/MX+MV"
-0x5333	0x8c10	"Card:S3 Savage (generic)"	"S3 Inc.|86C270-294 Savage/MX-MV"
-0x5333	0x8c11	"Card:S3 Savage (generic)"	"S3 Inc.|86C270-294 Savage/MX"
-0x5333	0x8c12	"Card:S3 Savage (generic, sw_cursor)"	"S3 Inc.|86C270-294 Savage/IX-MV"
-0x5333	0x8c13	"Card:S3 Savage (generic)"	"S3 Inc.|86C270-294 Savage/IX"
-0x5333	0x8c22	"Card:S3 Savage4"	"S3 Incorporated|86C508 SuperSavage 128/MX"
-0x5333	0x8c24	"Card:S3 Savage4"	"S3 Incorporated|SuperSavage/MX-/IX"
-0x5333	0x8c26	"Card:S3 Savage4"	"S3 Incorporated|SuperSavage/MX-/IX"
-0x5333	0x8c2a	"Card:S3 Savage4"	"S3 Incorporated|86C544 SuperSavage 128/IX"
-0x5333	0x8c2b	"Card:S3 Savage4"	"S3 Incorporated|86C553 SuperSavage 128/IX DDR"
-0x5333	0x8c2c	"Card:S3 Savage4"	"S3 Incorporated|86C564 SuperSavage/IX"
-0x5333	0x8c2d	"Card:S3 Savage4"	"S3 Incorporated|86C573 SuperSavage/IX DDR"
-0x5333	0x8c2e	"Card:S3 Savage4"	"S3 Incorporated|86C583 SuperSavage/IXC SDR"
-0x5333	0x8c2f	"Card:S3 Savage4"	"S3 Incorporated|86C594 SuperSavage/IXC DDR"
-0x5333	0x8d01	"Card:S3 Savage4"	"S3 Incorporated|Twister"
-0x5333	0x8d02	"Card:S3 Savage4"	"S3 Incorporated|Twister-K"
-0x5333	0x8d03	"Card:S3 Savage4"	"S3 Inc.|VT8751 [ProSavageDDR P4M266]"
-0x5333	0x8d04	"Card:S3 Savage4"	"S3 Inc.|VT8751 [ProSavageDDR P4M266] VGA Controller"
-0x5333	0x9102	"Card:S3 Savage2000 (generic)"	"S3 Inc.|86C410 Savage 2000"
+0x5333	0x8880	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c868 [Vision 868 VRAM] vers 0"
+0x5333	0x8881	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c868 [Vision 868 VRAM] vers 1"
+0x5333	0x8882	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c868 [Vision 868 VRAM] vers 2"
+0x5333	0x8883	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c868 [Vision 868 VRAM] vers 3"
+0x5333	0x88b0	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c928 [Vision 928 VRAM] vers 0"
+0x5333	0x88b1	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c928 [Vision 928 VRAM] vers 1"
+0x5333	0x88b2	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c928 [Vision 928 VRAM] vers 2"
+0x5333	0x88b3	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c928 [Vision 928 VRAM] vers 3"
+0x5333	0x88c0	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c864 [Vision 864 DRAM] vers 0"
+0x5333	0x88c1	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c864 [Vision 864 DRAM] vers 1"
+0x5333	0x88c2	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c864 [Vision 864-P DRAM] vers 2"
+0x5333	0x88c3	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c864 [Vision 864-P DRAM] vers 3"
+0x5333	0x88d0	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c964 [Vision 964 VRAM] vers 0"
+0x5333	0x88d1	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c964 [Vision 964 VRAM] vers 1"
+0x5333	0x88d2	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c964 [Vision 964-P VRAM] vers 2"
+0x5333	0x88d3	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c964 [Vision 964-P VRAM] vers 3"
+0x5333	0x88f0	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c968 [Vision 968 VRAM] rev 0"
+0x5333	0x88f1	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c968 [Vision 968 VRAM] rev 1"
+0x5333	0x88f2	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c968 [Vision 968 VRAM] rev 2"
+0x5333	0x88f3	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c968 [Vision 968 VRAM] rev 3"
+0x5333	0x8900	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|86c755 [Trio 64V2/DX]"
+0x5333	0x8901	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|Trio 64V2/DX or /GX"
+0x5333	0x8902	"Card:S3 Trio3D-based cards"	"S3 Inc.|Plato/PX (graphics)"
+0x5333	0x8903	"Card:S3 Trio3D-based cards"	"S3 Inc.|Trio 3D business multimedia"
+0x5333	0x8904	"Card:S3 Trio3D-based cards"	"S3 Inc.|Trio 64 3D"
+0x5333	0x8905	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|Trio 64V+ family"
+0x5333	0x8906	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|Trio 64V+ family"
+0x5333	0x8907	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|Trio 64V+ family"
+0x5333	0x8908	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|Trio 64V+ family"
+0x5333	0x8909	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|Trio 64V+ family"
+0x5333	0x890a	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|Trio 64V+ family"
+0x5333	0x890b	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|Trio 64V+ family"
+0x5333	0x890c	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|Trio 64V+ family"
+0x5333	0x890d	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|Trio 64V+ family"
+0x5333	0x890e	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|Trio 64V+ family"
+0x5333	0x890f	"Card:S3 8xx / 9xx / Trio-based cards"	"S3 Inc.|Trio 64V+ family"
+0x5333	0x8a01	"Card:S3 ViRGE-based cards"	"S3 Inc.|ViRGE/DX or /GX"
+0x5333	0x8a10	"Card:S3 ViRGE-based cards"	"S3 Inc.|ViRGE/GX2"
+0x5333	0x8a11	"Card:S3 ViRGE-based cards"	"S3 Incorporated|86C359 ViRGE /GX2+ Macrovision"
+0x5333	0x8a12	"Card:S3 ViRGE-based cards"	"S3 Incorporated|86C359 ViRGE /GX2+"
+0x5333	0x8a13	"Card:S3 Trio3D-based cards"	"S3 Inc.|86c368 [Trio 3D/2X]"
+0x5333	0x8a20	"Card:S3 Savage-based cards"	"S3 Inc.|86c794 [Savage 3D]"
+0x5333	0x8a21	"Card:S3 Savage-based cards"	"S3 Inc.|86c795 [Savage 3D/MV]"
+0x5333	0x8a22	"Card:S3 Savage-based cards"	"S3 Inc.|Savage 4"
+0x5333	0x8a23	"Card:S3 Savage-based cards"	"S3 Inc.|Savage 4"
+0x5333	0x8a25	"Card:S3 Savage-based cards"	"S3 Inc.|ProSavage PM133"
+0x5333	0x8a26	"Card:S3 Savage-based cards"	"S3 Inc.|ProSavage KM133"
+0x5333	0x8c00	"Card:S3 ViRGE/MX-based cards"	"S3 Inc.|ViRGE/M3"
+0x5333	0x8c01	"Card:S3 ViRGE/MX-based cards"	"S3 Inc.|ViRGE/MX"
+0x5333	0x8c02	"Card:S3 ViRGE/MX-based cards"	"S3 Inc.|ViRGE/MX+"
+0x5333	0x8c03	"Card:S3 ViRGE/MX-based cards"	"S3 Inc.|ViRGE/MX+MV"
+0x5333	0x8c10	"Card:S3 Savage-based cards"	"S3 Inc.|86C270-294 Savage/MX-MV"
+0x5333	0x8c11	"Card:S3 Savage-based cards"	"S3 Inc.|86C270-294 Savage/MX"
+0x5333	0x8c12	"Card:S3 Savage-based cards"	"S3 Inc.|86C270-294 Savage/IX-MV"
+0x5333	0x8c13	"Card:S3 Savage-based cards"	"S3 Inc.|86C270-294 Savage/IX"
+0x5333	0x8c22	"Card:S3 Savage-based cards"	"S3 Incorporated|86C508 SuperSavage 128/MX"
+0x5333	0x8c24	"Card:S3 Savage-based cards"	"S3 Incorporated|SuperSavage/MX-/IX"
+0x5333	0x8c26	"Card:S3 Savage-based cards"	"S3 Incorporated|SuperSavage/MX-/IX"
+0x5333	0x8c2a	"Card:S3 Savage-based cards"	"S3 Incorporated|86C544 SuperSavage 128/IX"
+0x5333	0x8c2b	"Card:S3 Savage-based cards"	"S3 Incorporated|86C553 SuperSavage 128/IX DDR"
+0x5333	0x8c2c	"Card:S3 Savage-based cards"	"S3 Incorporated|86C564 SuperSavage/IX"
+0x5333	0x8c2d	"Card:S3 Savage-based cards"	"S3 Incorporated|86C573 SuperSavage/IX DDR"
+0x5333	0x8c2e	"Card:S3 Savage-based cards"	"S3 Incorporated|86C583 SuperSavage/IXC SDR"
+0x5333	0x8c2f	"Card:S3 Savage-based cards"	"S3 Incorporated|86C594 SuperSavage/IXC DDR"
+0x5333	0x8d01	"Card:S3 Savage-based cards"	"S3 Incorporated|Twister"
+0x5333	0x8d02	"Card:S3 Savage-based cards"	"S3 Incorporated|Twister-K"
+0x5333	0x8d03	"Card:S3 Savage-based cards"	"S3 Inc.|VT8751 [ProSavageDDR P4M266]"
+0x5333	0x8d04	"Card:S3 Savage-based cards"	"S3 Inc.|VT8751 [ProSavageDDR P4M266] VGA Controller"
+0x5333	0x9102	"Card:S3 Savage-based cards"	"S3 Inc.|86C410 Savage 2000"
 0x5333	0xb031	"Card:VESA driver (generic)"	"S3 Inc.|86c775/86c785 [Trio 64V2/DX or /GX]"
 0x5333	0xca00	"sonicvibes"	"S3 Inc.|SonicVibes"
 0x5401	0x0101	"unknown"	"Ericsson|DSSS Wireless LAN PCI Card"