--- /usr/src/sys/pci/agp_i810.c.ORIG	Sun Sep 24 17:00:54 2006
+++ /usr/src/sys/pci/agp_i810.c	Sun Sep 24 19:47:09 2006
@@ -121,14 +121,14 @@
 	    "Intel 82915G (915G GMCH) SVGA controller"},
 	{0x25928086, CHIP_I915, 0x00020000,
 	    "Intel 82915GM (915GM GMCH) SVGA controller"},
+	{0x27A28086, CHIP_I915, 0x00020000,
+	    "Intel 82945GM (945GM GMCH) SVGA controller"},
 	/* XXX: I believe these chipsets should work, but they haven't been
 	 * tested yet.
 	 */
 	/*
 	{0x27728086, CHIP_I915, 0x00020000,
 	    "Intel 82945G (945G GMCH) SVGA controller"},
-	{0x27A28086, CHIP_I915, 0x00020000,
-	    "Intel 82945GM (945GM GMCH) SVGA controller"},
 	*/
 	{0, 0, 0, NULL}
 };
@@ -510,9 +510,8 @@
 	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) {
+		temp = pci_read_config(dev, AGP_I915_GMADR, 1);
+		if (temp & 1<<27) {
 			return 128 * 1024 * 1024;
 		} else {
 			return 256 * 1024 * 1024;