partially revert a Mesa commit to avoid hard hangs on Haswell

intel/eu: Use non-coherent mode (BTI=253) for stateless A64 messages
d23bbc8c28b6a5cd7f4d3d03c74d8319da5d47d5 on 20.1 branch
4985e380dd776ac65c4ae5627138211f9d9f03ce on mainline

thanks to gnezdo@ sthen@ and espie@ for reports and testing
This commit is contained in:
jsg 2020-09-11 15:04:43 +00:00
parent d7373d1cc2
commit ccfe449828

View File

@ -744,8 +744,7 @@ brw_dp_a64_untyped_surface_rw_desc(const struct gen_device_info *devinfo,
SET_BITS(brw_mdc_cmask(num_channels), 3, 0) | SET_BITS(brw_mdc_cmask(num_channels), 3, 0) |
SET_BITS(simd_mode, 5, 4); SET_BITS(simd_mode, 5, 4);
return brw_dp_desc(devinfo, GEN8_BTI_STATELESS_NON_COHERENT, return brw_dp_desc(devinfo, BRW_BTI_STATELESS, msg_type, msg_control);
msg_type, msg_control);
} }
/** /**
@ -783,8 +782,7 @@ brw_dp_a64_byte_scattered_rw_desc(const struct gen_device_info *devinfo,
SET_BITS(brw_mdc_a64_ds(bit_size / 8), 3, 2) | SET_BITS(brw_mdc_a64_ds(bit_size / 8), 3, 2) |
SET_BITS(exec_size == 16, 4, 4); SET_BITS(exec_size == 16, 4, 4);
return brw_dp_desc(devinfo, GEN8_BTI_STATELESS_NON_COHERENT, return brw_dp_desc(devinfo, BRW_BTI_STATELESS, msg_type, msg_control);
msg_type, msg_control);
} }
static inline uint32_t static inline uint32_t
@ -805,8 +803,7 @@ brw_dp_a64_untyped_atomic_desc(const struct gen_device_info *devinfo,
SET_BITS(bit_size == 64, 4, 4) | SET_BITS(bit_size == 64, 4, 4) |
SET_BITS(response_expected, 5, 5); SET_BITS(response_expected, 5, 5);
return brw_dp_desc(devinfo, GEN8_BTI_STATELESS_NON_COHERENT, return brw_dp_desc(devinfo, BRW_BTI_STATELESS, msg_type, msg_control);
msg_type, msg_control);
} }
static inline uint32_t static inline uint32_t
@ -825,8 +822,7 @@ brw_dp_a64_untyped_atomic_float_desc(const struct gen_device_info *devinfo,
SET_BITS(atomic_op, 1, 0) | SET_BITS(atomic_op, 1, 0) |
SET_BITS(response_expected, 5, 5); SET_BITS(response_expected, 5, 5);
return brw_dp_desc(devinfo, GEN8_BTI_STATELESS_NON_COHERENT, return brw_dp_desc(devinfo, BRW_BTI_STATELESS, msg_type, msg_control);
msg_type, msg_control);
} }
static inline uint32_t static inline uint32_t