Index: agp_i810.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/agp_i810.c,v
retrieving revision 1.32.2.2
diff -u -p -r1.32.2.2 agp_i810.c
--- agp_i810.c	23 Jun 2006 17:10:25 -0000	1.32.2.2
+++ agp_i810.c	23 Dec 2006 16:09:04 -0000
@@ -89,6 +89,8 @@ struct agp_i810_softc {
 	bus_space_tag_t gtt_bst;	/* bus_space tag */
 	bus_space_handle_t gtt_bsh;	/* bus_space handle */
 
+	struct resource *gm;		/* unmapped (but allocated) aperture */
+
 	void *argb_cursor;		/* contigmalloc area for ARGB cursor */
 };
 
@@ -144,6 +146,12 @@ agp_i810_match(device_t dev)
 
 	case 0x25928086:
 		return ("Intel 82915GM (915GM GMCH) SVGA controller");
+
+	case 0x27728086:
+		return ("Intel 82945G (945G GMCH) SVGA controller");
+
+	case 0x27A28086:
+		return ("Intel 82945GM (945GM GMCH) SVGA controller");
 	};
 
 	return NULL;
@@ -250,6 +258,8 @@ agp_i810_probe(device_t dev)
 			/* i915 */
 		case 0x25828086:
 		case 0x25928086:
+		case 0x27728086:	/* 945G GMCH */
+		case 0x27A28086:	/* 945GM GMCH */
 			gcc1 = pci_read_config(bdev, AGP_I915_DEVEN, 4);
 			if ((gcc1 & AGP_I915_DEVEN_D2F0) ==
 			    AGP_I915_DEVEN_D2F0_DISABLED) {
@@ -303,6 +313,8 @@ agp_i810_attach(device_t dev)
 		break;
 	case 0x25828086:
 	case 0x25928086:
+	case 0x27728086:	/* 945G GMCH */
+	case 0x27A28086:	/* 945GM GMCH */
 		sc->chiptype = CHIP_I915;
 		break;
 	};
@@ -328,12 +340,31 @@ agp_i810_attach(device_t dev)
 						 RF_ACTIVE);
 		if (!sc->gtt) {
 			bus_release_resource(dev, SYS_RES_MEMORY,
-					     AGP_I810_MMADR, sc->regs);
+					     AGP_I915_MMADR, sc->regs);
 			agp_generic_detach(dev);
 			return ENODEV;
 		}
 		sc->gtt_bst = rman_get_bustag(sc->gtt);
 		sc->gtt_bsh = rman_get_bushandle(sc->gtt);
+
+		/* While agp_generic_attach allocates the AGP_APBASE resource
+		 * to try to reserve the aperture, on the 915 the aperture
+		 * isn't in PCIR_BAR(0), it's in PCIR_BAR(2), so it allocated
+		 * the registers that we just mapped anyway.  So, allocate the
+		 * aperture here, which also gives us easy access to it for the
+		 * agp_i810_get_aperture().
+		 */
+		rid = AGP_I915_GMADR;
+		sc->gm = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, 0);
+		if (sc->gm == NULL) {
+			bus_release_resource(dev, SYS_RES_MEMORY,
+					     AGP_I915_MMADR, sc->regs);
+			bus_release_resource(dev, SYS_RES_MEMORY,
+					     AGP_I915_GTTADR, sc->regs);
+			agp_generic_detach(dev);
+			return ENODEV;
+		}
+
 	}
 
 	sc->initial_aperture = AGP_GET_APERTURE(dev);
@@ -491,6 +522,8 @@ agp_i810_detach(device_t dev)
 	free(sc->gatt, M_AGP);
 
 	if (sc->chiptype == CHIP_I915) {
+		bus_release_resource(dev, SYS_RES_MEMORY, AGP_I915_GMADR,
+				     sc->gm);
 		bus_release_resource(dev, SYS_RES_MEMORY, AGP_I915_GTTADR,
 				     sc->gtt);
 		bus_release_resource(dev, SYS_RES_MEMORY, AGP_I915_MMADR,
@@ -530,13 +563,12 @@ agp_i810_get_aperture(device_t dev)
 	case CHIP_I855:
 		return 128 * 1024 * 1024;
 	case CHIP_I915:
-		temp = pci_read_config(dev, AGP_I915_MSAC, 1);
-		if ((temp & AGP_I915_MSAC_GMASIZE) ==
-		    AGP_I915_MSAC_GMASIZE_128) {
-			return 128 * 1024 * 1024;
-		} else {
-			return 256 * 1024 * 1024;
-		}
+		/* The documentation states that AGP_I915_MSAC should have bit
+		 * 1 set if the aperture is 128MB instead of 256.  However,
+		 * that bit appears to not get set, so we instead use the
+		 * aperture resource size, which should always be correct.
+		 */
+		return rman_get_size(sc->gm);
 	}
 
 	return 0;