diff options
| author | Kenneth Graunke <[email protected]> | 2011-08-12 18:22:48 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2012-03-30 14:38:48 -0700 |
| commit | 180aecb6dce1df55eae674f0f72adbc6f4d872b9 (patch) | |
| tree | 11246ff80f03908e05862407e54b5d72ebab705c /src | |
| parent | 01044fce6b3de11635ea5078b76ffee1a33b3802 (diff) | |
i965: Add initial IS_HASWELL() macros.
For now, these all return 0, as I don't yet want to enable Haswell
support. Eventually they will be filled in with proper PCI IDs.
Also add an is_haswell field similar to is_g4x to make it easy to
distinguish Gen7 and Gen7.5.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_chipset.h | 9 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.c | 9 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.h | 1 |
3 files changed, 14 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_chipset.h b/src/mesa/drivers/dri/intel/intel_chipset.h index 2e9fb2dcca6..eefb430f0b3 100644 --- a/src/mesa/drivers/dri/intel/intel_chipset.h +++ b/src/mesa/drivers/dri/intel/intel_chipset.h @@ -151,7 +151,14 @@ #define IS_IVYBRIDGE(devid) (IS_IVB_GT1(devid) || IS_IVB_GT2(devid)) -#define IS_GEN7(devid) IS_IVYBRIDGE(devid) +#define IS_GEN7(devid) (IS_IVYBRIDGE(devid) || \ + IS_HASWELL(devid)) + +#define IS_HSW_GT1(devid) 0 +#define IS_HSW_GT2(devid) 0 + +#define IS_HASWELL(devid) (IS_HSW_GT1(devid) || \ + IS_HSW_GT2(devid)) #define IS_965(devid) (IS_GEN4(devid) || \ IS_G4X(devid) || \ diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index b87b3351006..fd5f0b604d6 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -608,15 +608,16 @@ intelInitContext(struct intel_context *intel, intel->gen = intelScreen->gen; const int devID = intelScreen->deviceID; - - if (IS_SNB_GT1(devID) || IS_IVB_GT1(devID)) + if (IS_SNB_GT1(devID) || IS_IVB_GT1(devID) || IS_HSW_GT1(devID)) intel->gt = 1; - else if (IS_SNB_GT2(devID) || IS_IVB_GT2(devID)) + else if (IS_SNB_GT2(devID) || IS_IVB_GT2(devID) || IS_HSW_GT2(devID)) intel->gt = 2; else intel->gt = 0; - if (IS_G4X(devID)) { + if (IS_HASWELL(devID)) { + intel->is_haswell = true; + } else if (IS_G4X(devID)) { intel->is_g4x = true; } else if (IS_945(devID)) { intel->is_945 = true; diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h index bfe5f9445b8..8ba727030fc 100644 --- a/src/mesa/drivers/dri/intel/intel_context.h +++ b/src/mesa/drivers/dri/intel/intel_context.h @@ -208,6 +208,7 @@ struct intel_context int gen; int gt; bool needs_ff_sync; + bool is_haswell; bool is_g4x; bool is_945; bool has_separate_stencil; |