From: Jason Ekstrand Date: Thu, 30 Jan 2020 17:34:51 +0000 (-0600) Subject: intel/fs: Write the address register with NoMask for MOV_INDIRECT X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f93dfb509cbf9474befae9919dd8c135bbd67093;p=mesa.git intel/fs: Write the address register with NoMask for MOV_INDIRECT This fixes a hang in the following Vulkan CTS test on TGL-LP: dEQP-VK.descriptor_indexing.storage_buffer_dynamic_in_loop Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Kenneth Graunke Tested-by: Marge Bot Part-of: --- diff --git a/src/intel/compiler/brw_fs_generator.cpp b/src/intel/compiler/brw_fs_generator.cpp index 7c8f7bde339..4f7bc159f07 100644 --- a/src/intel/compiler/brw_fs_generator.cpp +++ b/src/intel/compiler/brw_fs_generator.cpp @@ -452,8 +452,17 @@ fs_generator::generate_mov_indirect(fs_inst *inst, * In the end, while base_offset is nice to look at in the generated * code, using it saves us 0 instructions and would require quite a bit * of case-by-case work. It's just not worth it. + * + * There's some sort of HW bug on Gen12 which causes issues if we write + * to the address register in control-flow. Since we only ever touch + * the address register from the generator, we can easily enough work + * around it by setting NoMask on the add. */ + brw_push_insn_state(p); + if (devinfo->gen == 12) + brw_set_default_mask_control(p, BRW_MASK_DISABLE); brw_ADD(p, addr, indirect_byte_offset, brw_imm_uw(imm_byte_offset)); + brw_pop_insn_state(p); brw_set_default_swsb(p, tgl_swsb_regdist(1)); if (type_sz(reg.type) > 4 &&