diff options
| author | Kenneth Graunke <[email protected]> | 2012-03-19 13:42:16 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2012-03-30 14:39:31 -0700 |
| commit | bd2410b48df261251f75c2c69785c8cc3182d94d (patch) | |
| tree | bda3c2dd85a3d4e4c61df0b4a33076d9c3f6507b | |
| parent | 4848122a96a46d6725cbfe92041459d11aea70fc (diff) | |
intel: Add some PCI IDs for Haswell.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Eugeni Dodonov <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
| -rw-r--r-- | include/pci_ids/i965_pci_ids.h | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_chipset.h | 13 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.c | 9 |
3 files changed, 25 insertions, 2 deletions
diff --git a/include/pci_ids/i965_pci_ids.h b/include/pci_ids/i965_pci_ids.h index d37a2eed4b0..a29150955b4 100644 --- a/include/pci_ids/i965_pci_ids.h +++ b/include/pci_ids/i965_pci_ids.h @@ -25,3 +25,8 @@ CHIPSET(0x0162, IVYBRIDGE_GT2, ivb_gt2) CHIPSET(0x0156, IVYBRIDGE_M_GT1, ivb_gt1) CHIPSET(0x0166, IVYBRIDGE_M_GT2, ivb_gt2) CHIPSET(0x015a, IVYBRIDGE_S_GT1, ivb_gt1) +CHIPSET(0x0402, HASWELL_GT1, hsw_gt1) +CHIPSET(0x0412, HASWELL_GT2, hsw_gt2) +CHIPSET(0x0406, HASWELL_M_GT1, hsw_gt1) +CHIPSET(0x0416, HASWELL_M_GT2, hsw_gt2) +CHIPSET(0x0A16, HASWELL_M_ULT_GT2, hsw_gt2) diff --git a/src/mesa/drivers/dri/intel/intel_chipset.h b/src/mesa/drivers/dri/intel/intel_chipset.h index eefb430f0b3..424c70ce2f1 100644 --- a/src/mesa/drivers/dri/intel/intel_chipset.h +++ b/src/mesa/drivers/dri/intel/intel_chipset.h @@ -86,6 +86,12 @@ #define PCI_CHIP_IVYBRIDGE_M_GT2 0x0166 #define PCI_CHIP_IVYBRIDGE_S_GT1 0x015a /* Server */ +#define PCI_CHIP_HASWELL_GT1 0x0402 /* Desktop */ +#define PCI_CHIP_HASWELL_GT2 0x0412 +#define PCI_CHIP_HASWELL_M_GT1 0x0406 /* Mobile */ +#define PCI_CHIP_HASWELL_M_GT2 0x0416 +#define PCI_CHIP_HASWELL_M_ULT_GT2 0x0A16 /* Mobile ULT */ + #define IS_MOBILE(devid) (devid == PCI_CHIP_I855_GM || \ devid == PCI_CHIP_I915_GM || \ devid == PCI_CHIP_I945_GM || \ @@ -154,8 +160,11 @@ #define IS_GEN7(devid) (IS_IVYBRIDGE(devid) || \ IS_HASWELL(devid)) -#define IS_HSW_GT1(devid) 0 -#define IS_HSW_GT2(devid) 0 +#define IS_HSW_GT1(devid) (devid == PCI_CHIP_HASWELL_GT1 || \ + devid == PCI_CHIP_HASWELL_M_GT1) +#define IS_HSW_GT2(devid) (devid == PCI_CHIP_HASWELL_GT2 || \ + devid == PCI_CHIP_HASWELL_M_GT2 || \ + devid == PCI_CHIP_HASWELL_M_ULT_GT2) #define IS_HASWELL(devid) (IS_HSW_GT1(devid) || \ IS_HSW_GT2(devid)) diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 1aa2e9a40ec..ff2b7feec8d 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -185,6 +185,15 @@ intelGetString(struct gl_context * ctx, GLenum name) case PCI_CHIP_IVYBRIDGE_S_GT1: chipset = "Intel(R) Ivybridge Server"; break; + case PCI_CHIP_HASWELL_GT1: + case PCI_CHIP_HASWELL_GT2: + chipset = "Intel(R) Haswell Desktop"; + break; + case PCI_CHIP_HASWELL_M_GT1: + case PCI_CHIP_HASWELL_M_GT2: + case PCI_CHIP_HASWELL_M_ULT_GT2: + chipset = "Intel(R) Haswell Mobile"; + break; default: chipset = "Unknown Intel Chipset"; break; |