From: Eric Anholt <eric@anholt.net>
Date: Fri, 30 Mar 2007 20:08:14 +0000 (-0700)
Subject: Merge branch 'crestline-qa', adding support for the 965GM chipset.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=adb91c056f896955efcbf627bb1c2012aeb8a735;hp=7eba12edce871c3db835decbf1a0271acfd3eb68;p=mesa.git

Merge branch 'crestline-qa', adding support for the 965GM chipset.
---

diff --git a/src/mesa/drivers/dri/i965/intel_context.c b/src/mesa/drivers/dri/i965/intel_context.c
index 34560e4353e..10eb9a2e28d 100644
--- a/src/mesa/drivers/dri/i965/intel_context.c
+++ b/src/mesa/drivers/dri/i965/intel_context.c
@@ -115,6 +115,9 @@ static const GLubyte *intelGetString( GLcontext *ctx, GLenum name )
       case PCI_CHIP_I946_GZ:
 	 chipset = "Intel(R) 946GZ"; break;
          break;
+      case PCI_CHIP_I965_GM:
+	 chipset = "Intel(R) 965GM"; break;
+         break;
       default:
 	 chipset = "Unknown Intel Chipset"; break;
       }
diff --git a/src/mesa/drivers/dri/i965/intel_context.h b/src/mesa/drivers/dri/i965/intel_context.h
index a0f392f9353..808512f7fd5 100644
--- a/src/mesa/drivers/dri/i965/intel_context.h
+++ b/src/mesa/drivers/dri/i965/intel_context.h
@@ -384,6 +384,7 @@ extern int INTEL_DEBUG;
 #define PCI_CHIP_I965_Q			0x2992
 #define PCI_CHIP_I965_G_1		0x2982
 #define PCI_CHIP_I946_GZ		0x2972
+#define PCI_CHIP_I965_GM                0x2A02
 
 
 /* ================================================================