diff options
| author | Kenneth Graunke <[email protected]> | 2011-05-16 15:19:22 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2011-05-17 23:32:58 -0700 |
| commit | 89a82d72cafc1efbcf099e5229ba9b1cb53504f0 (patch) | |
| tree | a1d75be63e64c58b06db22915ff130f994444c10 /src | |
| parent | d55471768e308853432de7d18f663034ddbc8599 (diff) | |
intel: Initial IS_GEN7 plumbing.
Currently, IS_GEN7, IS_IVYBRIDGE, IS_IVB_GT1, and IS_IVB_GT2 all return
false. This allows me to write the code for them before actually adding
the PCI IDs and thus enabling the hardware.
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 | 11 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.c | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_screen.c | 4 |
3 files changed, 17 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_chipset.h b/src/mesa/drivers/dri/intel/intel_chipset.h index a3f40effc35..50b52bbb36d 100644 --- a/src/mesa/drivers/dri/intel/intel_chipset.h +++ b/src/mesa/drivers/dri/intel/intel_chipset.h @@ -136,10 +136,19 @@ #define IS_GEN6(devid) (IS_GT1(devid) || IS_GT2(devid)) +#define IS_IVB_GT1(devid) 0 + +#define IS_IVB_GT2(devid) 0 + +#define IS_IVYBRIDGE(devid) (IS_IVB_GT1(devid) || IS_IVB_GT2(devid)) + +#define IS_GEN7(devid) IS_IVYBRIDGE(devid) + #define IS_965(devid) (IS_GEN4(devid) || \ IS_G4X(devid) || \ IS_GEN5(devid) || \ - IS_GEN6(devid)) + IS_GEN6(devid) || \ + IS_GEN7(devid)) #define IS_9XX(devid) (IS_915(devid) || \ IS_945(devid) || \ diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index acdf35fc71b..ba3014e1e13 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -653,7 +653,10 @@ intelInitContext(struct intel_context *intel, intel->has_xrgb_textures = GL_TRUE; intel->gen = intelScreen->gen; - if (IS_GEN6(intel->intelScreen->deviceID)) { + if (IS_GEN7(intel->intelScreen->deviceID)) { + intel->needs_ff_sync = GL_TRUE; + intel->has_luminance_srgb = GL_TRUE; + } else if (IS_GEN6(intel->intelScreen->deviceID)) { intel->needs_ff_sync = GL_TRUE; intel->has_luminance_srgb = GL_TRUE; } else if (IS_GEN5(intel->intelScreen->deviceID)) { diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c index 5dacbb06633..deca11d8c34 100644 --- a/src/mesa/drivers/dri/intel/intel_screen.c +++ b/src/mesa/drivers/dri/intel/intel_screen.c @@ -556,7 +556,9 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp) intelScreen->deviceID = strtod(devid_override, NULL); } - if (IS_GEN6(intelScreen->deviceID)) { + if (IS_GEN7(intelScreen->deviceID)) { + intelScreen->gen = 7; + } else if (IS_GEN6(intelScreen->deviceID)) { intelScreen->gen = 6; } else if (IS_GEN5(intelScreen->deviceID)) { intelScreen->gen = 5; |