Unconditionally support the AMD64 GART HW.

8 files changed, 2 insertions, 34 deletions

diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 69a3656..0ecfd46 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -162,6 +162,3 @@ IPR_LOG			opt_i4b.h
 # Device options
 DEV_APIC		opt_apic.h
 DEV_NPX			opt_npx.h
-
-# agp options
-AGP_AMD64_GART		opt_agp.h
diff --git a/sys/dev/agp/agp_amd64.c b/sys/dev/agp/agp_amd64.c
index a4372f3..03b22d4 100644
--- a/sys/dev/agp/agp_amd64.c
+++ b/sys/dev/agp/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/dev/agp/agp_sis.c b/sys/dev/agp/agp_sis.c
index c662b7e..ee2eecf 100644
--- a/sys/dev/agp/agp_sis.c
+++ b/sys/dev/agp/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/dev/agp/agp_via.c b/sys/dev/agp/agp_via.c
index 441d26e..87d8563 100644
--- a/sys/dev/agp/agp_via.c
+++ b/sys/dev/agp/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
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 6d02aa4..6a6b4e6 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -350,7 +350,6 @@ device		pci
 #
 # AGP GART support
 device		agp
-options 	AGP_AMD64_GART	# Included GART code for AMD64 machines.
 
 
 #####################################################################
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