diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-01 13:35:36 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-01 13:37:04 +0000 |
| commit | 3c5c8ba71c4c32dcac1cf0493210d21fc9b33c8a (patch) | |
| tree | ad650b0f236e822c221049ff3d43d76cdb87bc87 /lib/intel_chipset.h | |
| parent | c1e9795050b1e4b76c7f9acd3cc5071f0ecb06ed (diff) | |
Search for the first Intel dri device.
This is vital in a multi-GPU system so that we only test the Intel card
and not the discrete GPUs.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'lib/intel_chipset.h')
| -rwxr-xr-x | lib/intel_chipset.h | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/lib/intel_chipset.h b/lib/intel_chipset.h index 91e4164a..95764ce6 100755 --- a/lib/intel_chipset.h +++ b/lib/intel_chipset.h @@ -95,7 +95,6 @@ #define IS_ILD(devid) (devid == PCI_CHIP_ILD_G) #define IS_ILM(devid) (devid == PCI_CHIP_ILM_G) -#define IS_IRONLAKE(devid) (IS_ILD(devid) || IS_ILM(devid)) #define IS_915(devid) (devid == PCI_CHIP_I915_G || \ devid == PCI_CHIP_E7221_G || \ @@ -111,6 +110,13 @@ devid == PCI_CHIP_Q33_G || \ devid == PCI_CHIP_Q35_G || IS_IGD(devid)) +#define IS_GEN2(devid) (devid == PCI_CHIP_I830_M || \ + devid == PCI_CHIP_845_G || \ + devid == PCI_CHIP_I855_GM || \ + devid == PCI_CHIP_I865_G) + +#define IS_GEN3(devid) (IS_945(devid) || IS_915(devid)) + #define IS_GEN4(devid) (devid == PCI_CHIP_I965_G || \ devid == PCI_CHIP_I965_Q || \ devid == PCI_CHIP_I965_G_1 || \ @@ -120,9 +126,11 @@ IS_G4X(devid)) #define IS_965(devid) (IS_GEN4(devid) || \ - IS_IRONLAKE(devid) || \ + IS_GEN5(devid) || \ IS_GEN6(devid)) +#define IS_GEN5(devid) (IS_ILD(devid) || IS_ILM(devid)) + #define IS_GEN6(devid) (devid == PCI_CHIP_SANDYBRIDGE_GT1 || \ devid == PCI_CHIP_SANDYBRIDGE_GT2 || \ devid == PCI_CHIP_SANDYBRIDGE_GT2_PLUS || \ @@ -131,9 +139,16 @@ devid == PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS || \ devid == PCI_CHIP_SANDYBRIDGE_S) -#define IS_9XX(devid) (IS_915(devid) || \ - IS_945(devid) || \ - IS_965(devid)) +#define IS_9XX(devid) (IS_GEN3(devid) || \ + IS_GEN4(devid) || \ + IS_GEN4(devid) || \ + IS_GEN6(devid)) + +#define IS_INTEL(devid) (IS_GEN2(devid) || \ + IS_GEN3(devid) || \ + IS_GEN4(devid) || \ + IS_GEN4(devid) || \ + IS_GEN6(devid)) -#define HAS_PCH_SPLIT(devid) (IS_IRONLAKE(devid) || \ +#define HAS_PCH_SPLIT(devid) (IS_GEN5(devid) || \ IS_GEN6(devid)) |