i965: official name for GM45 chipset

[mesa.git] / src / mesa / drivers / dri / intel / intel_chipset.h

diff --git a/src/mesa/drivers/dri/intel/intel_chipset.h b/src/mesa/drivers/dri/intel/intel_chipset.h
index 4fc4c963765099193b6ce287da00bc23707c2e6f..15b9ef431273ec5e8b0f7a7c01eab5094e6374be 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_chipset.h
+++ b/src/mesa/drivers/dri/intel/intel_chipset.h
@@ -36,6 +36,7 @@
 #define PCI_CHIP_I865_G                        0x2572
 
 #define PCI_CHIP_I915_G                        0x2582
+#define PCI_CHIP_E7221_G               0x258A
 #define PCI_CHIP_I915_GM               0x2592
 #define PCI_CHIP_I945_G                        0x2772
 #define PCI_CHIP_I945_GM               0x27A2
@@ -52,29 +53,28 @@
 #define PCI_CHIP_I965_GM                0x2A02
 #define PCI_CHIP_I965_GME               0x2A12
 
+#define PCI_CHIP_GM45_GM                0x2A42
+
+#define PCI_CHIP_IGD_E_G                0x2E02
+#define PCI_CHIP_Q45_G                  0x2E12
+#define PCI_CHIP_G45_G                  0x2E22
+
 #define IS_MOBILE(devid)       (devid == PCI_CHIP_I855_GM || \
                                 devid == PCI_CHIP_I915_GM || \
                                 devid == PCI_CHIP_I945_GM || \
                                 devid == PCI_CHIP_I945_GME || \
                                 devid == PCI_CHIP_I965_GM || \
-                                devid == PCI_CHIP_I965_GME)
-
-#define IS_965(devid)          (devid == PCI_CHIP_I965_G || \
-                                devid == PCI_CHIP_I965_Q || \
-                                devid == PCI_CHIP_I965_G_1 || \
-                                devid == PCI_CHIP_I965_GM || \
                                 devid == PCI_CHIP_I965_GME || \
-                                devid == PCI_CHIP_I946_GZ)
+                                devid == PCI_CHIP_GM45_GM)
 
-#define IS_9XX(devid)          (devid == PCI_CHIP_I915_G || \
-                                devid == PCI_CHIP_I915_GM || \
-                                devid == PCI_CHIP_I945_G || \
-                                devid == PCI_CHIP_I945_GM || \
-                                devid == PCI_CHIP_I945_GME || \
-                                devid == PCI_CHIP_G33_G || \
-                                devid == PCI_CHIP_Q35_G || \
-                                devid == PCI_CHIP_Q33_G || \
-                                IS_965(devid))
+#define IS_GM45_GM(devid)       (devid == PCI_CHIP_GM45_GM)
+#define IS_G4X(devid)           (devid == PCI_CHIP_IGD_E_G || \
+                                 devid == PCI_CHIP_Q45_G || \
+                                 devid == PCI_CHIP_G45_G)
+
+#define IS_915(devid)          (devid == PCI_CHIP_I915_G || \
+                                devid == PCI_CHIP_E7221_G || \
+                                devid == PCI_CHIP_I915_GM)
 
 #define IS_945(devid)          (devid == PCI_CHIP_I945_G || \
                                 devid == PCI_CHIP_I945_GM || \
@@ -82,3 +82,16 @@
                                 devid == PCI_CHIP_G33_G || \
                                 devid == PCI_CHIP_Q33_G || \
                                 devid == PCI_CHIP_Q35_G)
+
+#define IS_965(devid)          (devid == PCI_CHIP_I965_G || \
+                                devid == PCI_CHIP_I965_Q || \
+                                devid == PCI_CHIP_I965_G_1 || \
+                                devid == PCI_CHIP_I965_GM || \
+                                devid == PCI_CHIP_I965_GME || \
+                                devid == PCI_CHIP_I946_GZ || \
+                                IS_GM45_GM(devid) || \
+                                IS_G4X(devid))
+
+#define IS_9XX(devid)          (IS_915(devid) || \
+                                IS_945(devid) || \
+                                IS_965(devid))