kern/103079: Add support to 945GM and fix how recognize agp aperture size

[Marcus Alves Grando]

>Number:         103079
>Category:       kern
>Synopsis:       Add support to 945GM and fix how recognize agp aperture size
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 09 19:30:18 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Marcus Alves Grando
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
Grupos Internet S/A
>Environment:
System: FreeBSD marcus.grupos.com.br 6.1-STABLE FreeBSD 6.1-STABLE #1: Fri Sep 8 00:25:53 BRT 2006 root at marcus.grupos.com.br:/usr/obj/usr/src/sys/MARCUS i386


	
>Description:

- Add support to 945GM and fix how recognize agp aperture size, based on how linux does.

	
>How-To-Repeat:
	
>Fix:

	

--- agp_i810.c.current-patch begins here ---
Index: agp_i810.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/agp_i810.c,v
retrieving revision 1.38
diff -u -r1.38 agp_i810.c
--- agp_i810.c	27 Jun 2006 14:05:11 -0000	1.38
+++ agp_i810.c	9 Sep 2006 19:19:50 -0000
@@ -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;
--- agp_i810.c.current-patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: