diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2007-11-26 10:35:43 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2007-11-26 10:35:43 +0000 |
| commit | 21bf0d98fe86c8006a14862017c848bca0c51a95 (patch) | |
| tree | 7e30618e7c3079f497035690860d622095b8ef41 /sys/arch | |
| parent | 464afe6e47a10f3be60e044677bf8f7ab272a34d (diff) | |
fix new agp code on amd64
- internal intel graphics semi-agp chipsets need special handling in pchb.c
- re-add the i965GM device
- use the correct major device id for /dev/agp0 on amd64 (not the i386 one)
ok deraadt@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/pci/pchb.c | 27 | ||||
| -rw-r--r-- | sys/arch/i386/pci/pchb.c | 3 |
2 files changed, 28 insertions, 2 deletions
diff --git a/sys/arch/amd64/pci/pchb.c b/sys/arch/amd64/pci/pchb.c index dfd27f45f4b..571bdc5b814 100644 --- a/sys/arch/amd64/pci/pchb.c +++ b/sys/arch/amd64/pci/pchb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pchb.c,v 1.12 2007/11/25 17:11:12 oga Exp $ */ +/* $OpenBSD: pchb.c,v 1.13 2007/11/26 10:35:42 reyk Exp $ */ /* $NetBSD: pchb.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $ */ /* * Copyright (c) 2000 Michael Shalayeff @@ -166,6 +166,31 @@ pchbattach(struct device *parent, struct device *self, void *aux) has_agp = 0; switch (PCI_VENDOR(pa->pa_id)) { + case PCI_VENDOR_INTEL: + switch (PCI_PRODUCT(pa->pa_id)) { + case PCI_PRODUCT_INTEL_82915G_HB: + case PCI_PRODUCT_INTEL_82915GM_HB: + case PCI_PRODUCT_INTEL_82945GP_MCH: + case PCI_PRODUCT_INTEL_82945GM_MCH: + case PCI_PRODUCT_INTEL_82Q963_HB: + case PCI_PRODUCT_INTEL_82965_MCH: + case PCI_PRODUCT_INTEL_82965GM_MCH: + /* + * The host bridge is either in GFX mode (internal + * graphics) or in AGP mode. In GFX mode, we pretend + * to have AGP because the graphics memory access + * is very similar and the AGP GATT code will + * deal with this. In the latter case, the + * pci_get_capability(PCI_CAP_AGP) test below will + * fire, so we do no harm by already setting the flag. + */ + has_agp = 1; + break; + } + break; + } + + switch (PCI_VENDOR(pa->pa_id)) { case PCI_VENDOR_AMD: switch (PCI_PRODUCT(pa->pa_id)) { case PCI_PRODUCT_AMD_AMD64_HT: diff --git a/sys/arch/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c index 081dcaed476..6173e3f8612 100644 --- a/sys/arch/i386/pci/pchb.c +++ b/sys/arch/i386/pci/pchb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pchb.c,v 1.58 2007/11/25 17:11:12 oga Exp $ */ +/* $OpenBSD: pchb.c,v 1.59 2007/11/26 10:35:42 reyk Exp $ */ /* $NetBSD: pchb.c,v 1.65 2007/08/15 02:26:13 markd Exp $ */ /* @@ -328,6 +328,7 @@ pchbattach(struct device *parent, struct device *self, void *aux) case PCI_PRODUCT_INTEL_82945GM_MCH: case PCI_PRODUCT_INTEL_82Q963_HB: case PCI_PRODUCT_INTEL_82965_MCH: + case PCI_PRODUCT_INTEL_82965GM_MCH: /* * The host bridge is either in GFX mode (internal * graphics) or in AGP mode. In GFX mode, we pretend |