diff options
| author | Carl Switzky <Carl.Switzky@Sun.COM> | 2006-10-19 17:30:54 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@guitar.keithp.com> | 2007-02-17 17:18:28 -0800 |
| commit | 6fd297e362af7e8d3770801f34cb84f757397898 (patch) | |
| tree | d819312944dabe582a657b97bca8a5796628eaa9 | |
| parent | d3f507c2a2cc190d417a257b40a49a4a2926e3d3 (diff) | |
Add ast driver/device info to Xorg server & config utilities
(cherry picked from commit edd5f1745461f995670969cb736d1569ca94643f)
| -rw-r--r-- | hw/xfree86/common/xf86PciInfo.h | 4 | ||||
| -rw-r--r-- | hw/xfree86/utils/xorgcfg/text-mode.c | 1 | ||||
| -rw-r--r-- | hw/xfree86/utils/xorgconfig/Cards | 5 |
3 files changed, 10 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86PciInfo.h b/hw/xfree86/common/xf86PciInfo.h index b8ba73f6a..0630cfa82 100644 --- a/hw/xfree86/common/xf86PciInfo.h +++ b/hw/xfree86/common/xf86PciInfo.h @@ -92,6 +92,7 @@ #define PCI_VENDOR_TRITECH 0x1292 #define PCI_VENDOR_NVIDIA_SGS 0x12D2 #define PCI_VENDOR_VMWARE 0x15AD +#define PCI_VENDOR_AST 0x1A03 #define PCI_VENDOR_3DLABS 0x3D3D #define PCI_VENDOR_AVANCE_2 0x4005 #define PCI_VENDOR_HERCULES 0x4843 @@ -358,6 +359,9 @@ #define PCI_CHIP_RS350_7834 0x7834 #define PCI_CHIP_RS350_7835 0x7835 +/* ASPEED Technology (AST) */ +#define PCI_CHIP_AST2000 0x2000 + /* Avance Logic */ #define PCI_CHIP_ALG2064 0x2064 #define PCI_CHIP_ALG2301 0x2301 diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c index 0430a5463..91d9be262 100644 --- a/hw/xfree86/utils/xorgcfg/text-mode.c +++ b/hw/xfree86/utils/xorgcfg/text-mode.c @@ -1128,6 +1128,7 @@ CardConfig(void) static char *xdrivers[] = { "apm", "ark", + "ast", "ati", "r128", "radeon", diff --git a/hw/xfree86/utils/xorgconfig/Cards b/hw/xfree86/utils/xorgconfig/Cards index bf30eab1d..b95928c37 100644 --- a/hw/xfree86/utils/xorgconfig/Cards +++ b/hw/xfree86/utils/xorgconfig/Cards @@ -51,6 +51,11 @@ NAME ** Ark Logic (generic) [ark] SERVER SVGA DRIVER ark +NAME ** ASPEED Technology (generic) [ast] +#CHIPSET ast +SERVER SVGA +DRIVER ast + NAME ** ATI (generic) [ati] #CHIPSET ati SERVER SVGA |