Module Name: src
Committed By: riz
Date: Sat Nov 20 00:18:59 UTC 2010
Modified Files:
src/sys/dev/pci [netbsd-5]: agp_i810.c agp_intel.c pcidevs
Log Message:
Pull up following revision(s) (requested by jakllsch in ticket #1362):
sys/dev/pci/pcidevs: revision 1.1026
sys/dev/pci/agp_intel.c: revision 1.35
sys/dev/pci/agp_i810.c: revision 1.67
Add Intel 82855GM Host-AGP Bridge.
regen
Add (non-IGP) AGP port support for Intel 82855GM.
agp_intel tested with radeondrm(4). agp_i810 tested with i915drm(4).
To generate a diff of this commit:
cvs rdiff -u -r1.56.4.1 -r1.56.4.2 src/sys/dev/pci/agp_i810.c
cvs rdiff -u -r1.32 -r1.32.8.1 src/sys/dev/pci/agp_intel.c
cvs rdiff -u -r1.962.4.13 -r1.962.4.14 src/sys/dev/pci/pcidevs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/agp_i810.c
diff -u src/sys/dev/pci/agp_i810.c:1.56.4.1 src/sys/dev/pci/agp_i810.c:1.56.4.2
--- src/sys/dev/pci/agp_i810.c:1.56.4.1 Tue May 5 18:17:57 2009
+++ src/sys/dev/pci/agp_i810.c Sat Nov 20 00:18:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_i810.c,v 1.56.4.1 2009/05/05 18:17:57 bouyer Exp $ */
+/* $NetBSD: agp_i810.c,v 1.56.4.2 2010/11/20 00:18:59 riz Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.56.4.1 2009/05/05 18:17:57 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.56.4.2 2010/11/20 00:18:59 riz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -241,6 +241,7 @@
case PCI_PRODUCT_INTEL_82865_HB:
case PCI_PRODUCT_INTEL_82845G_DRAM:
case PCI_PRODUCT_INTEL_82815_FULL_HUB:
+ case PCI_PRODUCT_INTEL_82855GM_MCH:
return agp_intel_attach(parent, self, aux);
}
#endif
Index: src/sys/dev/pci/agp_intel.c
diff -u src/sys/dev/pci/agp_intel.c:1.32 src/sys/dev/pci/agp_intel.c:1.32.8.1
--- src/sys/dev/pci/agp_intel.c:1.32 Mon Jun 9 06:49:54 2008
+++ src/sys/dev/pci/agp_intel.c Sat Nov 20 00:18:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_intel.c,v 1.32 2008/06/09 06:49:54 freza Exp $ */
+/* $NetBSD: agp_intel.c,v 1.32.8.1 2010/11/20 00:18:59 riz Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_intel.c,v 1.32 2008/06/09 06:49:54 freza Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_intel.c,v 1.32.8.1 2010/11/20 00:18:59 riz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,6 +90,7 @@
agp_intel_vgamatch(struct pci_attach_args *pa)
{
switch (PCI_PRODUCT(pa->pa_id)) {
+ case PCI_PRODUCT_INTEL_82855GM_AGP:
case PCI_PRODUCT_INTEL_82855PM_AGP:
case PCI_PRODUCT_INTEL_82443LX_AGP:
case PCI_PRODUCT_INTEL_82443BX_AGP:
@@ -148,6 +149,7 @@
case PCI_PRODUCT_INTEL_82840_AGP:
isc->chiptype = CHIP_I840;
break;
+ case PCI_PRODUCT_INTEL_82855GM_AGP:
case PCI_PRODUCT_INTEL_82855PM_AGP:
case PCI_PRODUCT_INTEL_82845_AGP:
isc->chiptype = CHIP_I845;
Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.962.4.13 src/sys/dev/pci/pcidevs:1.962.4.14
--- src/sys/dev/pci/pcidevs:1.962.4.13 Fri Nov 19 23:58:40 2010
+++ src/sys/dev/pci/pcidevs Sat Nov 20 00:18:58 2010
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.962.4.13 2010/11/19 23:58:40 riz Exp $
+$NetBSD: pcidevs,v 1.962.4.14 2010/11/20 00:18:58 riz Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2636,6 +2636,7 @@
product INTEL 82830MP_IV 0x3577 82830MP Integrated Video
product INTEL 82830MP_IO_2 0x3578 82830MP CPU to I/O Bridge 2
product INTEL 82855GM_MCH 0x3580 82855GM Host-Hub Controller
+product INTEL 82855GM_AGP 0x3581 82855GM Host-AGP Bridge
product INTEL 82855GM_IGD 0x3582 82855GM GMCH Integrated Graphics Device
product INTEL 82855GM_MC 0x3584 82855GM GMCH Memory Controller
product INTEL 82855GM_CP 0x3585 82855GM GMCH Configuration Process
