diff options
| author | obrien <obrien@FreeBSD.org> | 2004-08-19 20:58:24 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2004-08-19 20:58:24 +0000 |
| commit | 311d4dd9cc2c279274dd1074d605959c09bfe327 (patch) | |
| tree | e4f41b9a4d7e960f728cdf5759e22b0b620a2479 /sys/pci | |
| parent | 80499ed5b20aefa1aa91e7674e6d3df2e6b6503f (diff) | |
| download | FreeBSD-src-311d4dd9cc2c279274dd1074d605959c09bfe327.zip FreeBSD-src-311d4dd9cc2c279274dd1074d605959c09bfe327.tar.gz | |
Unconditionally support the AMD64 GART HW.
Diffstat (limited to 'sys/pci')
| -rw-r--r-- | sys/pci/agp_amd64.c | 3 | ||||
| -rw-r--r-- | sys/pci/agp_sis.c | 3 | ||||
| -rw-r--r-- | sys/pci/agp_via.c | 10 |
3 files changed, 1 insertions, 15 deletions
diff --git a/sys/pci/agp_amd64.c b/sys/pci/agp_amd64.c index a4372f3..03b22d4 100644 --- a/sys/pci/agp_amd64.c +++ b/sys/pci/agp_amd64.c @@ -28,9 +28,6 @@ __FBSDID("$FreeBSD$"); #include "opt_bus.h" -#ifdef __i386__ -#include "opt_agp.h" -#endif #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/pci/agp_sis.c b/sys/pci/agp_sis.c index c662b7e..ee2eecf 100644 --- a/sys/pci/agp_sis.c +++ b/sys/pci/agp_sis.c @@ -28,7 +28,6 @@ __FBSDID("$FreeBSD$"); #include "opt_bus.h" -#include "opt_agp.h" #include <sys/param.h> #include <sys/systm.h> @@ -106,10 +105,8 @@ agp_sis_match(device_t dev) return ("SiS 746 host to AGP bridge"); case 0x07601039: return ("SiS 760 host to AGP bridge"); -#if defined(__amd64__) || defined(AGP_AMD64_GART) case 0x10221039: /* AMD64 */ return NULL; -#endif }; if (pci_get_vendor(dev) == 0x1039) diff --git a/sys/pci/agp_via.c b/sys/pci/agp_via.c index 441d26e..87d8563 100644 --- a/sys/pci/agp_via.c +++ b/sys/pci/agp_via.c @@ -28,7 +28,6 @@ __FBSDID("$FreeBSD$"); #include "opt_bus.h" -#include "opt_agp.h" #include <sys/param.h> #include <sys/systm.h> @@ -88,12 +87,8 @@ agp_via_match(device_t dev) return ("VIA 82C694X (Apollo Pro 133A) host to PCI bridge"); case 0x06911106: return ("VIA 82C691 (Apollo Pro) host to PCI bridge"); - case 0x31881106: -#if defined(__amd64__) || defined(AGP_AMD64_GART) + case 0x31881106: /* AMD64 GART */ return NULL; -#else - return ("VIA 8385 host to PCI bridge"); -#endif case 0x31891106: return ("VIA 8377 (Apollo KT400/KT400A/KT600) host to PCI bridge"); }; @@ -130,9 +125,6 @@ agp_via_attach(device_t dev) u_int32_t agpsel; switch (pci_get_devid(dev)) { -#ifdef AGP_NO_AMD64_GART - case 0x31881106: -#endif case 0x31891106: /* The newer VIA chipsets will select the AGP version based on * what AGP versions the card supports. We still have to |
