From: Ian Romanick <ian.d.roman...@intel.com>

Inspired by Damien's recent libdrm changes.

Signed-off-by: Ian Romanick <ian.d.roman...@intel.com>
Cc: Damien Lespiau <damien.lesp...@intel.com>
---
 src/mesa/drivers/dri/i915/intel_chipset.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/mesa/drivers/dri/i915/intel_chipset.h 
b/src/mesa/drivers/dri/i915/intel_chipset.h
index cbcdb14..d33a80f 100644
--- 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,7 +58,9 @@
                                 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 || \
-- 
2.1.0

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to