Add AGP and hostbridge support for the Intel 82945GME chipset.

ok jsg@

diff --git a/sys/arch/amd64/pci/pchb.c b/sys/arch/amd64/pci/pchb.c
index fbd78e4..84d8b4c 100644 (file)
--- a/sys/arch/amd64/pci/pchb.c
+++ b/sys/arch/amd64/pci/pchb.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pchb.c,v 1.24 2008/06/26 05:42:09 ray Exp $   */
+/*     $OpenBSD: pchb.c,v 1.25 2008/07/07 07:54:48 bernd Exp $ */
 /*     $NetBSD: pchb.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $    */
 /*
  * Copyright (c) 2000 Michael Shalayeff
@@ -171,6 +171,7 @@ pchbattach(struct device *parent, struct device *self, void *aux)
                /* AGP only */
                case PCI_PRODUCT_INTEL_82915GM_HB:
                case PCI_PRODUCT_INTEL_82945GM_HB:
+               case PCI_PRODUCT_INTEL_82945GME_HB:
                case PCI_PRODUCT_INTEL_82G965_HB:
                case PCI_PRODUCT_INTEL_82Q965_HB:
                case PCI_PRODUCT_INTEL_82GM965_HB:

diff --git a/sys/arch/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c
index db93f07..48a0c85 100644 (file)
--- a/sys/arch/i386/pci/pchb.c
+++ b/sys/arch/i386/pci/pchb.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pchb.c,v 1.72 2008/06/26 05:42:11 ray Exp $ */
+/*     $OpenBSD: pchb.c,v 1.73 2008/07/07 07:54:48 bernd Exp $ */
 /*     $NetBSD: pchb.c,v 1.65 2007/08/15 02:26:13 markd Exp $  */
 
 /*
@@ -323,6 +323,7 @@ pchbattach(struct device *parent, struct device *self, void *aux)
 #endif /* __i386__ */
                case PCI_PRODUCT_INTEL_82915GM_HB:
                case PCI_PRODUCT_INTEL_82945GM_HB:
+               case PCI_PRODUCT_INTEL_82945GME_HB:
                case PCI_PRODUCT_INTEL_82G965_HB:
                case PCI_PRODUCT_INTEL_82Q965_HB:
                case PCI_PRODUCT_INTEL_82GM965_HB:

diff --git a/sys/dev/pci/agp.c b/sys/dev/pci/agp.c
index 32eac48..7f35a12 100644 (file)
--- a/sys/dev/pci/agp.c
+++ b/sys/dev/pci/agp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: agp.c,v 1.22 2008/06/25 18:54:06 oga Exp $ */
+/* $OpenBSD: agp.c,v 1.23 2008/07/07 07:54:48 bernd Exp $ */
 /*-
  * Copyright (c) 2000 Doug Rabson
  * All rights reserved.
@@ -87,6 +87,7 @@ const struct agp_product agp_products[] = {
        { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82915GM_HB, agp_i810_attach },
        { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945G_HB, agp_i810_attach },
        { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945GM_HB, agp_i810_attach },
+       { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82945GME_HB, agp_i810_attach },
        { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G965_HB, agp_i810_attach },
        { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q965_HB, agp_i810_attach },
        { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82GM965_HB, agp_i810_attach },

diff --git a/sys/dev/pci/agp_i810.c b/sys/dev/pci/agp_i810.c
index 4a0af97..7861bd0 100644 (file)
--- a/sys/dev/pci/agp_i810.c
+++ b/sys/dev/pci/agp_i810.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: agp_i810.c,v 1.38 2008/06/25 18:54:06 oga Exp $       */
+/*     $OpenBSD: agp_i810.c,v 1.39 2008/07/07 07:54:48 bernd Exp $     */
 /*     $NetBSD: agp_i810.c,v 1.15 2003/01/31 00:07:39 thorpej Exp $    */
 
 /*-
@@ -137,6 +137,7 @@ agp_i810_vgamatch(struct pci_attach_args *pa)
        case PCI_PRODUCT_INTEL_82945G_IGD_2:
        case PCI_PRODUCT_INTEL_82945GM_IGD_1:
        case PCI_PRODUCT_INTEL_82945GM_IGD_2:
+       case PCI_PRODUCT_INTEL_82945GME_IGD_1:
        case PCI_PRODUCT_INTEL_82G965_IGD_1:
        case PCI_PRODUCT_INTEL_82G965_IGD_2:
        case PCI_PRODUCT_INTEL_82Q965_IGD_1:
@@ -214,6 +215,7 @@ agp_i810_attach(struct agp_softc *sc, struct pci_attach_args *pa)
        case PCI_PRODUCT_INTEL_82945G_IGD_2:
        case PCI_PRODUCT_INTEL_82945GM_IGD_1:
        case PCI_PRODUCT_INTEL_82945GM_IGD_2:
+       case PCI_PRODUCT_INTEL_82945GME_IGD_1:
                isc->chiptype = CHIP_I915;
                break;
        case PCI_PRODUCT_INTEL_82Q965_IGD_1: