intel: Recognize new Ivybridge PCI IDs.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/mesa/drivers/dri/intel/intel_chipset.h b/src/mesa/drivers/dri/intel/intel_chipset.h
index 50b52bbb36d7107535704d66421b301a767577e8..40fb69049c1e16564587798f175ec0bd1b75afc0 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_chipset.h
+++ b/src/mesa/drivers/dri/intel/intel_chipset.h
@@ -80,6 +80,12 @@
 #define PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS        0x0126
 #define PCI_CHIP_SANDYBRIDGE_S         0x010A  /* Server */
 
+#define PCI_CHIP_IVYBRIDGE_GT1          0x0152  /* Desktop */
+#define PCI_CHIP_IVYBRIDGE_GT2          0x0162
+#define PCI_CHIP_IVYBRIDGE_M_GT1        0x0156  /* Mobile */
+#define PCI_CHIP_IVYBRIDGE_M_GT2        0x0166
+#define PCI_CHIP_IVYBRIDGE_S_GT1        0x015a  /* Server */
+
 #define IS_MOBILE(devid)       (devid == PCI_CHIP_I855_GM || \
                                 devid == PCI_CHIP_I915_GM || \
                                 devid == PCI_CHIP_I945_GM || \
@@ -136,9 +142,12 @@
 
 #define IS_GEN6(devid)         (IS_GT1(devid) || IS_GT2(devid))
 
-#define IS_IVB_GT1(devid)       0
+#define IS_IVB_GT1(devid)       (devid == PCI_CHIP_IVYBRIDGE_GT1 || \
+                                devid == PCI_CHIP_IVYBRIDGE_M_GT1 || \
+                                devid == PCI_CHIP_IVYBRIDGE_S_GT1)
 
-#define IS_IVB_GT2(devid)       0
+#define IS_IVB_GT2(devid)       (devid == PCI_CHIP_IVYBRIDGE_GT2 || \
+                                devid == PCI_CHIP_IVYBRIDGE_M_GT2)
 
 #define IS_IVYBRIDGE(devid)     (IS_IVB_GT1(devid) || IS_IVB_GT2(devid))
 

diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index ba3014e1e13ac6cc2d95f3a71ff67978bf415279..4516db20ffcc595e9f7d1746f583bc57e150b8c0 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -173,6 +173,17 @@ intelGetString(struct gl_context * ctx, GLenum name)
       case PCI_CHIP_SANDYBRIDGE_S:
         chipset = "Intel(R) Sandybridge Server";
         break;
+      case PCI_CHIP_IVYBRIDGE_GT1:
+      case PCI_CHIP_IVYBRIDGE_GT2:
+        chipset = "Intel(R) Ivybridge Desktop";
+        break;
+      case PCI_CHIP_IVYBRIDGE_M_GT1:
+      case PCI_CHIP_IVYBRIDGE_M_GT2:
+        chipset = "Intel(R) Ivybridge Mobile";
+        break;
+      case PCI_CHIP_IVYBRIDGE_S_GT1:
+        chipset = "Intel(R) Ivybridge Server";
+        break;
       default:
          chipset = "Unknown Intel Chipset";
          break;