diff options
| author | Eric Anholt <eric@anholt.net> | 2010-02-25 10:56:09 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-02-25 10:56:18 -0800 |
| commit | 6a9705f41d4b6c43bc3459c69d021d0f042cd8ce (patch) | |
| tree | 58288b96c8bcc3e89b9a7f9d93d466454c1aa5b9 /src/mesa/drivers/dri/intel/intel_chipset.h | |
| parent | b43cfa9c5eac505c0a5e82b6f3b6d57d54860045 (diff) | |
| parent | 38c449409207c8948c1961a3132475bbd422f8f1 (diff) | |
Merge branch 'sandybridge'
This brings in the initial code I've been working on for bringing up
OpenGL on Sandybridge in the i965 driver. It doesn't work yet.
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_chipset.h')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_chipset.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_chipset.h b/src/mesa/drivers/dri/intel/intel_chipset.h index 3dc8653a73..a0b2266925 100644 --- a/src/mesa/drivers/dri/intel/intel_chipset.h +++ b/src/mesa/drivers/dri/intel/intel_chipset.h @@ -1,4 +1,4 @@ -/* + /* * Copyright © 2007 Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a @@ -71,6 +71,8 @@ #define PCI_CHIP_ILD_G 0x0042 #define PCI_CHIP_ILM_G 0x0046 +#define PCI_CHIP_SANDYBRIDGE 0x0102 + #define IS_MOBILE(devid) (devid == PCI_CHIP_I855_GM || \ devid == PCI_CHIP_I915_GM || \ devid == PCI_CHIP_I945_GM || \ @@ -104,14 +106,20 @@ devid == PCI_CHIP_Q33_G || \ devid == PCI_CHIP_Q35_G || IS_IGD(devid)) -#define IS_965(devid) (devid == PCI_CHIP_I965_G || \ +#define IS_GEN4(devid) (devid == PCI_CHIP_I965_G || \ devid == PCI_CHIP_I965_Q || \ devid == PCI_CHIP_I965_G_1 || \ devid == PCI_CHIP_I965_GM || \ devid == PCI_CHIP_I965_GME || \ devid == PCI_CHIP_I946_GZ || \ + IS_G4X(devid)) + +#define IS_GEN6(devid) (devid == PCI_CHIP_SANDYBRIDGE) + +#define IS_965(devid) (IS_GEN4(devid) || \ IS_G4X(devid) || \ - IS_IGDNG(devid)) + IS_IGDNG(devid) || \ + IS_GEN6(devid)) #define IS_9XX(devid) (IS_915(devid) || \ IS_945(devid) || \ |