i965: Move device info initialization to common code

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

diff --git a/src/mesa/drivers/dri/i915/intel_chipset.h b/src/mesa/drivers/dri/i915/intel_chipset.h
index cbcdb140438f3021f4264d2943cf1cd0a27dba14..7523ab77421d2406ba2a0f75a0f5b01fbea58a96 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_chipset.h
+++ b/src/mesa/drivers/dri/i915/intel_chipset.h
@@ -49,10 +49,6 @@
 #define PCI_CHIP_PNV_GM                        0xA011
 #define PCI_CHIP_PNV_G                 0xA001
 
-#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 || \
                                 devid == PCI_CHIP_I945_GME || \
@@ -62,10 +58,7 @@
                                 devid == PCI_CHIP_PNV_G || \
                                 devid == PCI_CHIP_PNV_GM)
 
-#define IS_GEN3(devid)         (IS_915(devid) ||       \
+#define IS_GEN3(devid)         (devid == PCI_CHIP_I915_G || \
+                                devid == PCI_CHIP_E7221_G || \
+                                devid == PCI_CHIP_I915_GM || \
                                 IS_945(devid))
-
-#define IS_GEN2(devid)         (devid == PCI_CHIP_I830_M || \
-                                devid == PCI_CHIP_845_G ||  \
-                                devid == PCI_CHIP_I855_GM ||   \
-                                devid == PCI_CHIP_I865_G)