i915: Add support for a new G33-like chipset.

Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-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 d1b4941601e63e44aaddbffc07a09409a5cfe076..4593d90df3d2f95e2bf8a059a604bbbce8034ee6 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_chipset.h
+++ b/src/mesa/drivers/dri/intel/intel_chipset.h
@@ -46,6 +46,13 @@
 #define PCI_CHIP_G33_G                 0x29C2
 #define PCI_CHIP_Q33_G                 0x29D2
 
+#define PCI_CHIP_IGD_GM                        0xA011
+#define PCI_CHIP_IGD_G                 0xA001
+
+#define IS_IGDGM(devid)        (devid == PCI_CHIP_IGD_GM)
+#define IS_IGDG(devid) (devid == PCI_CHIP_IGD_G)
+#define IS_IGD(devid) (IS_IGDG(devid) || IS_IGDGM(devid))
+
 #define PCI_CHIP_I965_G                        0x29A2
 #define PCI_CHIP_I965_Q                        0x2992
 #define PCI_CHIP_I965_G_1              0x2982
@@ -66,7 +73,7 @@
                                 devid == PCI_CHIP_I945_GME || \
                                 devid == PCI_CHIP_I965_GM || \
                                 devid == PCI_CHIP_I965_GME || \
-                                devid == PCI_CHIP_GM45_GM)
+                                devid == PCI_CHIP_GM45_GM || IS_IGD(devid))
 
 #define IS_G45(devid)           (devid == PCI_CHIP_IGD_E_G || \
                                  devid == PCI_CHIP_Q45_G || \
@@ -84,7 +91,7 @@
                                 devid == PCI_CHIP_I945_GME || \
                                 devid == PCI_CHIP_G33_G || \
                                 devid == PCI_CHIP_Q33_G || \
-                                devid == PCI_CHIP_Q35_G)
+                                devid == PCI_CHIP_Q35_G || IS_IGD(devid))
 
 #define IS_965(devid)          (devid == PCI_CHIP_I965_G || \
                                 devid == PCI_CHIP_I965_Q || \

diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 1aa173db181e0ea1d82c511c1c9f6431c6f288f1..b3f6fc02dff1e8c42ed75e837f987dea65ffeaed 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -123,6 +123,10 @@ intelGetString(GLcontext * ctx, GLenum name)
       case PCI_CHIP_Q33_G:
         chipset = "Intel(R) Q33";
         break;
+      case PCI_CHIP_IGD_GM:
+      case PCI_CHIP_IGD_G:
+        chipset = "Intel(R) IGD";
+        break;
       case PCI_CHIP_I965_Q:
         chipset = "Intel(R) 965Q";
         break;