aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/conf/files.amd647
-rw-r--r--sys/conf/files.i38616
-rw-r--r--sys/conf/files.pc9812
-rw-r--r--sys/dev/agp/agp_via.c9
-rw-r--r--sys/modules/agp/Makefile2
5 files changed, 28 insertions, 18 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index b2224dc2a39a..b0b37eca465e 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -132,9 +132,10 @@ crypto/via/padlock.c optional padlock
crypto/via/padlock_cipher.c optional padlock
crypto/via/padlock_hash.c optional padlock
dev/acpica/acpi_if.m standard
-dev/agp/agp_amd64.c optional agp
-dev/agp/agp_i810.c optional agp
-dev/agp/agp_intel.c optional agp
+dev/agp/agp_amd64.c optional agp
+dev/agp/agp_i810.c optional agp
+dev/agp/agp_intel.c optional agp
+dev/agp/agp_via.c optional agp
dev/arcmsr/arcmsr.c optional arcmsr pci
dev/asmc/asmc.c optional asmc isa
dev/atkbdc/atkbd.c optional atkbd atkbdc
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 72c12691d7d1..9a74ec6cdcc7 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -118,15 +118,15 @@ crypto/via/padlock.c optional padlock
crypto/via/padlock_cipher.c optional padlock
crypto/via/padlock_hash.c optional padlock
dev/advansys/adv_isa.c optional adv isa
-dev/agp/agp_ali.c optional agp
-dev/agp/agp_amd.c optional agp
-dev/agp/agp_amd64.c optional agp
-dev/agp/agp_ati.c optional agp
-dev/agp/agp_i810.c optional agp
-dev/agp/agp_intel.c optional agp
+dev/agp/agp_ali.c optional agp
+dev/agp/agp_amd.c optional agp
+dev/agp/agp_amd64.c optional agp
+dev/agp/agp_ati.c optional agp
+dev/agp/agp_i810.c optional agp
+dev/agp/agp_intel.c optional agp
dev/agp/agp_nvidia.c optional agp
-dev/agp/agp_sis.c optional agp
-dev/agp/agp_via.c optional agp
+dev/agp/agp_sis.c optional agp
+dev/agp/agp_via.c optional agp
dev/aic/aic_isa.c optional aic isa
dev/arcmsr/arcmsr.c optional arcmsr pci
dev/ar/if_ar.c optional ar
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index f9b8487c8605..8e728cc13de2 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -77,13 +77,13 @@ bf_enc.o optional crypto | ipsec \
compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
no-implicit-rule
crypto/des/arch/i386/des_enc.S optional crypto | ipsec | netsmb
-dev/agp/agp_ali.c optional agp
-dev/agp/agp_amd.c optional agp
-dev/agp/agp_i810.c optional agp
-dev/agp/agp_intel.c optional agp
+dev/agp/agp_ali.c optional agp
+dev/agp/agp_amd.c optional agp
+dev/agp/agp_i810.c optional agp
+dev/agp/agp_intel.c optional agp
dev/agp/agp_nvidia.c optional agp
-dev/agp/agp_sis.c optional agp
-dev/agp/agp_via.c optional agp
+dev/agp/agp_sis.c optional agp
+dev/agp/agp_via.c optional agp
dev/aic/aic_cbus.c optional aic isa
dev/ar/if_ar.c optional ar
dev/ar/if_ar_pci.c optional ar pci
diff --git a/sys/dev/agp/agp_via.c b/sys/dev/agp/agp_via.c
index 9b8bbc8b019b..dedc9da25ed2 100644
--- a/sys/dev/agp/agp_via.c
+++ b/sys/dev/agp/agp_via.c
@@ -85,8 +85,14 @@ agp_via_match(device_t dev)
return ("VIA 3296 (P4M800) host to PCI bridge");
case 0x03051106:
return ("VIA 82C8363 (Apollo KT133x/KM133) host to PCI bridge");
+ case 0x03141106:
+ return ("VIA 3314 (P4M800CE) host to PCI bridge");
case 0x03241106:
return ("VIA VT3324 (CX700) host to PCI bridge");
+ case 0x03271106:
+ return ("VIA 3327 (P4M890) host to PCI bridge");
+ case 0x03641106:
+ return ("VIA 3364 (P4M900) host to PCI bridge");
case 0x03911106:
return ("VIA 8371 (Apollo KX133) host to PCI bridge");
case 0x05011106:
@@ -168,7 +174,10 @@ agp_via_attach(device_t dev)
case 0x02591106:
case 0x02691106:
case 0x02961106:
+ case 0x03141106:
case 0x03241106:
+ case 0x03271106:
+ case 0x03641106:
case 0x31231106:
case 0x31681106:
case 0x31891106:
diff --git a/sys/modules/agp/Makefile b/sys/modules/agp/Makefile
index 4e2735e98e1d..04113630d7c2 100644
--- a/sys/modules/agp/Makefile
+++ b/sys/modules/agp/Makefile
@@ -12,7 +12,7 @@ SRCS+= agp_i810.c agp_intel.c agp_via.c agp_sis.c agp_ali.c agp_amd.c \
SRCS+= agp_amd64.c
.endif
.if ${MACHINE_ARCH} == "amd64"
-SRCS+= agp_amd64.c agp_i810.c
+SRCS+= agp_amd64.c agp_i810.c agp_via.c
.endif
SRCS+= device_if.h bus_if.h agp_if.h pci_if.h
SRCS+= opt_bus.h