<div dir="ltr"><div><div><div>I had to squash 6, 9, 14, and 15 together in order to be able to review properly. It would be much easier if we split things by component rather than by what mechanical change is being done. I've got more to say on the cover letter. In any case, 6, 9, 14, and 15 are </div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> </div>If you squashed them together, I wouldn't mind at all. </div>--Jason </div><div class="gmail_extra"> <div class="gmail_quote">On Tue, May 16, 2017 at 10:25 AM, Anuj Phogat <<a href="mailto:anuj.phogat@gmail.com" target="_blank">anuj.phogat@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">V2: Start using gen10 functions isl_gen10*(), gen10_blorp_exec() gen10_init_atoms() (Jason) Remove Vulkan changes. Do them later in a separate patch. Cc: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> Signed-off-by: Anuj Phogat <<a href="mailto:anuj.phogat@gmail.com">anuj.phogat@gmail.com</a>> --- src/intel/common/gen_l3_config.c | 1 + src/intel/compiler/brw_eu.c | 2 ++ src/intel/compiler/brw_eu_compact.c | 1 + src/intel/isl/isl.c | 9 +++++++++ src/mesa/drivers/dri/i965/brw_blorp.c | 6 ++++++ src/mesa/drivers/dri/i965/brw_formatquery.c | 1 + src/mesa/drivers/dri/i965/brw_state_upload.c | 4 +++- src/mesa/drivers/dri/i965/intel_screen.c | 1 + 8 files changed, 24 insertions(+), 1 deletion(-) <div><div class="h5"> diff --git a/src/intel/common/gen_l3_config.c b/src/intel/common/gen_l3_config.c index 0783217..4fe3503 100644 --- a/src/intel/common/gen_l3_config.c +++ b/src/intel/common/gen_l3_config.c @@ -116,6 +116,7 @@ get_l3_configs(const struct gen_device_info *devinfo) return (devinfo->is_cherryview ? chv_l3_configs : bdw_l3_configs); case 9: + case 10: return chv_l3_configs; default: diff --git a/src/intel/compiler/brw_eu.c b/src/intel/compiler/brw_eu.c index 77400c1..2c0dc27 100644 --- a/src/intel/compiler/brw_eu.c +++ b/src/intel/compiler/brw_eu.c @@ -412,6 +412,7 @@ enum gen { GEN75 = (1 << 5), GEN8 = (1 << 6), GEN9 = (1 << 7), + GEN10 = (1 << 8), GEN_ALL = ~0 }; @@ -688,6 +689,7 @@ gen_from_devinfo(const struct gen_device_info *devinfo) case 7: return devinfo->is_haswell ? GEN75 : GEN7; case 8: return GEN8; case 9: return GEN9; + case 10: return GEN10; default: unreachable("not reached"); } diff --git a/src/intel/compiler/brw_eu_compact.c b/src/intel/compiler/brw_eu_compact.c index b2af76d..740a395 100644 --- a/src/intel/compiler/brw_eu_compact.c +++ b/src/intel/compiler/brw_eu_compact.c @@ -1362,6 +1362,7 @@ brw_init_compaction_tables(const struct gen_device_info *devinfo) assert(gen8_src_index_table[ARRAY_SIZE(gen8_src_index_table) - 1] != 0); switch (devinfo->gen) { + case 10: case 9: case 8: control_index_table = gen8_control_index_table; diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c </div></div>index f89f351..0ae72a4 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -1674,6 +1674,9 @@ isl_surf_fill_state_s(const struct isl_device *dev, void *state, case 9: isl_gen9_surf_fill_state_s(dev, state, info); break; + case 10: + isl_gen10_surf_fill_state_s(dev, state, info); + break; default: assert(!"Cannot fill surface state for this gen"); } @@ -1705,6 +1708,9 @@ isl_buffer_fill_state_s(const struct isl_device *dev, void *state, case 9: isl_gen9_buffer_fill_state_s(state, info); break; + case 10: + isl_gen10_buffer_fill_state_s(state, info); + break; default: assert(!"Cannot fill surface state for this gen"); } @@ -1772,6 +1778,9 @@ isl_emit_depth_stencil_hiz_s(const struct isl_device *dev, void *batch, case 9: isl_gen9_emit_depth_stencil_hiz_s(dev, batch, info); break; + case 10: + isl_gen10_emit_depth_stencil_hiz_s(dev, batch, info); + break; default: assert(!"Cannot fill surface state for this gen"); } diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c index b69cb4f..8d3bcbb 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.c +++ b/src/mesa/drivers/dri/i965/brw_blorp.c @@ -99,6 +99,12 @@ brw_blorp_init(struct brw_context *brw) brw->blorp.mocs.vb = SKL_MOCS_WB; brw->blorp.exec = gen9_blorp_exec; break; + case 10: + brw->blorp.mocs.tex = SKL_MOCS_WB; + brw->blorp.mocs.rb = SKL_MOCS_PTE; + brw->blorp.mocs.vb = SKL_MOCS_WB; + brw->blorp.exec = gen10_blorp_exec; + break; default: unreachable("Invalid gen"); } diff --git a/src/mesa/drivers/dri/i965/brw_formatquery.c b/src/mesa/drivers/dri/i965/brw_formatquery.c index 96cc6e0..5faf91f 100644 --- a/src/mesa/drivers/dri/i965/brw_formatquery.c +++ b/src/mesa/drivers/dri/i965/brw_formatquery.c @@ -37,6 +37,7 @@ brw_query_samples_for_format(struct gl_context *ctx, GLenum target, (void) internalFormat; switch (brw->gen) { + case 10: case 9: samples[0] = 16; samples[1] = 8; diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c index bcb7ff1..35962df 100644 --- a/src/mesa/drivers/dri/i965/brw_state_upload.c +++ b/src/mesa/drivers/dri/i965/brw_state_upload.c @@ -134,7 +134,9 @@ void brw_init_state( struct brw_context *brw ) brw_init_caches(brw); - if (brw->gen >= 9) + if (brw->gen >= 10) + gen10_init_atoms(brw); + else if (brw->gen >= 9) gen9_init_atoms(brw); else if (brw->gen >= 8) gen8_init_atoms(brw); <div class="HOEnZb"><div class="h5">diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 65a0b5c..ec4a3e0 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1678,6 +1678,7 @@ set_max_gl_versions(struct intel_screen *screen) const bool has_astc = screen->devinfo.gen >= 9; switch (screen->devinfo.gen) { + case 10: case 9: case 8: dri_screen->max_gl_core_version = 45; -- 2.9.3 </div></div></blockquote></div> </div>