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

This commit is contained in:
Eric Anholt 2007-03-30 13:08:14 -07:00
commit adb91c056f
2 changed files with 4 additions and 0 deletions

View File

@ -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;
}

View File

@ -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
/* ================================================================