go back to brw_eu.h rev 1.9 matching upstream 20.1 branch

haswell hangs still occurred just less frequently with the 1.10 revert of
'intel/eu: Use non-coherent mode (BTI=253) for stateless A64 messages'

The recent kernel change to do wbinvd across all cpus instead of just one
is a better approach and avoids hangs seen with piglit on haswell.
This commit is contained in:
jsg 2020-09-14 07:16:06 +00:00
parent fd0b27a538
commit 1c44290c8f

View File

@ -744,7 +744,8 @@ 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, BRW_BTI_STATELESS, msg_type, msg_control); return brw_dp_desc(devinfo, GEN8_BTI_STATELESS_NON_COHERENT,
msg_type, msg_control);
} }
/** /**
@ -782,7 +783,8 @@ 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, BRW_BTI_STATELESS, msg_type, msg_control); return brw_dp_desc(devinfo, GEN8_BTI_STATELESS_NON_COHERENT,
msg_type, msg_control);
} }
static inline uint32_t static inline uint32_t
@ -803,7 +805,8 @@ 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, BRW_BTI_STATELESS, msg_type, msg_control); return brw_dp_desc(devinfo, GEN8_BTI_STATELESS_NON_COHERENT,
msg_type, msg_control);
} }
static inline uint32_t static inline uint32_t
@ -822,7 +825,8 @@ 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, BRW_BTI_STATELESS, msg_type, msg_control); return brw_dp_desc(devinfo, GEN8_BTI_STATELESS_NON_COHERENT,
msg_type, msg_control);
} }
static inline uint32_t static inline uint32_t