summaryrefslogtreecommitdiff
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2007-03-30 13:08:14 -0700
committerEric Anholt <eric@anholt.net>2007-03-30 13:11:38 -0700
commitadb91c056f896955efcbf627bb1c2012aeb8a735 (patch)
tree82111e136d9cf926857ed9989b486859d5873fd4 /src/mesa/drivers
parent7eba12edce871c3db835decbf1a0271acfd3eb68 (diff)
parentee9bc897f8ea361539c5f422fdecc2326271e673 (diff)
Merge branch 'crestline-qa', adding support for the 965GM chipset.
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/i965/intel_context.c3
-rw-r--r--src/mesa/drivers/dri/i965/intel_context.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_context.c b/src/mesa/drivers/dri/i965/intel_context.c
index 34560e4353..10eb9a2e28 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 a0f392f935..808512f7fd 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
/* ================================================================