Unconditionally support the AMD64 GART HW.

This commit is contained in:
David E. O'Brien 2004-08-19 20:58:24 +00:00
parent cc99ac24db
commit f49f2ca64e
8 changed files with 2 additions and 34 deletions

View file

@ -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

View file

@ -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>

View file

@ -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)

View file

@ -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

View file

@ -350,7 +350,6 @@ device pci
#
# AGP GART support
device agp
options AGP_AMD64_GART # Included GART code for AMD64 machines.
#####################################################################

View file

@ -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>

View file

@ -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)

View file

@ -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