>Number:         37201
>Category:       port-i386
>Synopsis:       Intel 82G965 Chipset support
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    port-i386-maintainer
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Oct 25 08:05:00 +0000 2007
>Originator:     Yasushi Oshima
>Release:        NetBSD/i386 4.99.34
>Organization:
>Environment:

>Description:
Intel G965 Chipset is a variation of Intel 965 family.
http://www.intel.com/products/chipsets/G965/index.htm

NetBSD has not supported G965 chipset yet but already supported Q965.
G965 and Q965 look alike very much, however the product number of PCI is different.

>How-To-Repeat:

>Fix:
I add product number for G965 and some change for internal video chip.
It works well on both i386 and amd64.


Index: sys/arch/amd64/pci/pchb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/pci/pchb.c,v
retrieving revision 1.7
diff -u -r1.7 pchb.c
--- arch/amd64/pci/pchb.c       18 Dec 2006 12:07:40 -0000      1.7
+++ arch/amd64/pci/pchb.c       24 Oct 2007 10:56:42 -0000
@@ -139,6 +139,8 @@
                case PCI_PRODUCT_INTEL_82915GM_HB:
                case PCI_PRODUCT_INTEL_82945P_MCH:
                case PCI_PRODUCT_INTEL_82945GM_HB:
+               case PCI_PRODUCT_INTEL_82965Q_HB:
+               case PCI_PRODUCT_INTEL_82965G_HB:
                        /*
                         * The host bridge is either in GFX mode (internal
                         * graphics) or in AGP mode. In GFX mode, we pretend
Index: sys/arch/i386/pci/pchb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pci/pchb.c,v
retrieving revision 1.66
diff -u -r1.66 pchb.c
--- arch/i386/pci/pchb.c        17 Oct 2007 19:54:58 -0000      1.66
+++ arch/i386/pci/pchb.c        24 Oct 2007 11:00:13 -0000
@@ -317,6 +317,7 @@
                case PCI_PRODUCT_INTEL_82945P_MCH:
                case PCI_PRODUCT_INTEL_82945GM_HB:
                case PCI_PRODUCT_INTEL_82965Q_HB:
+               case PCI_PRODUCT_INTEL_82965G_HB:
                        /*
                         * The host bridge is either in GFX mode (internal
                         * graphics) or in AGP mode. In GFX mode, we pretend
Index: sys/dev/pci/agp.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/agp.c,v
retrieving revision 1.49
diff -u -r1.49 agp.c
--- dev/pci/agp.c       19 Oct 2007 12:00:38 -0000      1.49
+++ dev/pci/agp.c       24 Oct 2007 11:01:04 -0000
@@ -157,6 +157,8 @@
          NULL,                 agp_i810_attach },
        { PCI_VENDOR_INTEL,     PCI_PRODUCT_INTEL_82965Q_HB,
          NULL,                 agp_i810_attach },
+       { PCI_VENDOR_INTEL,     PCI_PRODUCT_INTEL_82965G_HB,
+         NULL,                 agp_i810_attach },
 #endif
 
 #if NAGP_INTEL > 0
Index: sys/dev/pci/agp_i810.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/agp_i810.c,v
retrieving revision 1.43
diff -u -r1.43 agp_i810.c
--- dev/pci/agp_i810.c  19 Oct 2007 12:00:39 -0000      1.43
+++ dev/pci/agp_i810.c  24 Oct 2007 11:01:04 -0000
@@ -149,6 +149,8 @@
        case PCI_PRODUCT_INTEL_82945GM_IGD_1:
        case PCI_PRODUCT_INTEL_82965Q_IGD:
        case PCI_PRODUCT_INTEL_82965Q_IGD_1:
+       case PCI_PRODUCT_INTEL_82965G_IGD:
+       case PCI_PRODUCT_INTEL_82965G_IGD_1:
                return (1);
        }
 
@@ -233,6 +235,8 @@
                break;
        case PCI_PRODUCT_INTEL_82965Q_IGD:
        case PCI_PRODUCT_INTEL_82965Q_IGD_1:
+       case PCI_PRODUCT_INTEL_82965G_IGD:
+       case PCI_PRODUCT_INTEL_82965G_IGD_1:
                isc->chiptype = CHIP_I965;
                break;
        }
Index: sys/dev/pci/pcidevs
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/pcidevs,v
retrieving revision 1.907
diff -u -r1.907 pcidevs
--- dev/pci/pcidevs     22 Oct 2007 14:59:38 -0000      1.907
+++ dev/pci/pcidevs     24 Oct 2007 10:58:31 -0000
@@ -2416,6 +2416,10 @@
 product INTEL 82965Q_EXP       0x2991  82965Q PCI Express Bridge
 product INTEL 82965Q_IGD       0x2992  82965Q Integrated Graphics Device
 product INTEL 82965Q_IGD_1     0x2993  82965Q Integrated Graphics Device
+product INTEL 82965G_HB                0x29a0  82965G Host Bridge
+product INTEL 82965G_EXP       0x29a1  82965G PCI Express Bridge
+product INTEL 82965G_IGD       0x29a2  82965G Integrated Graphics Device
+product INTEL 82965G_IGD_1     0x29a3  82965G Integrated Graphics Device
 product INTEL 82801I_LAN       0x29c4  82801I LAN Controller
 product INTEL 31244            0x3200  31244 Serial ATA Controller
 product INTEL 82855PM_DDR      0x3340  82855PM MCH Host Controller