diff -ru mesa-6.4.1.orig/src/mesa/drivers/dri/i915/i915_texstate.c mesa-6.4.1/src/mesa/drivers/dri/i915/i915_texstate.c
--- mesa-6.4.1.orig/src/mesa/drivers/dri/i915/i915_texstate.c	2005-06-01 01:10:03.000000000 +0700
+++ mesa-6.4.1/src/mesa/drivers/dri/i915/i915_texstate.c	2006-03-19 20:47:20.000000000 +0700
@@ -496,7 +496,8 @@
    }
 
 
-   if (i915->intel.intelScreen->deviceID == PCI_CHIP_I945_G)
+   if (i915->intel.intelScreen->deviceID == PCI_CHIP_I945_G
+       || i915->intel.intelScreen->deviceID == PCI_CHIP_I945_GM)
       i945LayoutTextureImages( i915, tObj );	 
    else
       i915LayoutTextureImages( i915, tObj );
diff -ru mesa-6.4.1.orig/src/mesa/drivers/dri/i915/intel_context.c mesa-6.4.1/src/mesa/drivers/dri/i915/intel_context.c
--- mesa-6.4.1.orig/src/mesa/drivers/dri/i915/intel_context.c	2005-09-10 23:44:26.000000000 +0700
+++ mesa-6.4.1/src/mesa/drivers/dri/i915/intel_context.c	2006-03-19 20:47:36.000000000 +0700
@@ -118,6 +118,8 @@
 	 chipset = "Intel(R) 915GM"; break;
       case PCI_CHIP_I945_G:
 	 chipset = "Intel(R) 945G"; break;
+      case PCI_CHIP_I945_GM:
+	 chipset = "Intel(R) 945GM"; break;
       default:
 	 chipset = "Unknown Intel Chipset"; break;
       }
diff -ru mesa-6.4.1.orig/src/mesa/drivers/dri/i915/intel_context.h mesa-6.4.1/src/mesa/drivers/dri/i915/intel_context.h
--- mesa-6.4.1.orig/src/mesa/drivers/dri/i915/intel_context.h	2005-06-01 01:10:03.000000000 +0700
+++ mesa-6.4.1/src/mesa/drivers/dri/i915/intel_context.h	2006-03-19 20:48:58.000000000 +0700
@@ -413,6 +413,7 @@
 #define PCI_CHIP_I915_G			0x2582
 #define PCI_CHIP_I915_GM		0x2592
 #define PCI_CHIP_I945_G			0x2772
+#define PCI_CHIP_I945_GM		0x27A2
 
 
 /* ================================================================
diff -ru mesa-6.4.1.orig/src/mesa/drivers/dri/i915/intel_screen.c mesa-6.4.1/src/mesa/drivers/dri/i915/intel_screen.c
--- mesa-6.4.1.orig/src/mesa/drivers/dri/i915/intel_screen.c	2005-08-15 13:59:24.000000000 +0700
+++ mesa-6.4.1/src/mesa/drivers/dri/i915/intel_screen.c	2006-03-19 20:48:02.000000000 +0700
@@ -340,6 +340,7 @@
    case PCI_CHIP_I915_G:
    case PCI_CHIP_I915_GM:
    case PCI_CHIP_I945_G:
+   case PCI_CHIP_I945_GM:
       return i915CreateContext( mesaVis, driContextPriv, 
 			       sharedContextPrivate );