diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-09-22 02:09:17 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-09-22 02:09:17 +0000 |
| commit | 865c23c9c56f47f6cf8d73e8a6060a0c33a28b93 (patch) | |
| tree | aeed22bc39ce87dd6f09ff173c8273beaef65fe7 /lib/mesa/src/gallium/include/pipe/p_video_state.h | |
| parent | 27e7bb02bd0f89f96d9e3b402b46c2c97ee4defe (diff) | |
Merge Mesa 20.0.8
With Mesa 20.1 even after the kernel change to do wbinvd on all cpus
sthen@ reported that hard hangs still occurred on his Haswell system
with inteldrm.
Mark Kane also reported seeing hangs on Ivy Bridge on bugs@.
Some systems/workloads seem to be more prone to triggering this than
others as I have not seen any hangs on Ivy Bridge and the only hangs
I saw on Haswell when running piglit went away with the wbinvd change.
It seems something is wrong with drm memory attributes or coherency in
the kernel and newer Mesa versions expect behaviour we don't have.
Diffstat (limited to 'lib/mesa/src/gallium/include/pipe/p_video_state.h')
| -rw-r--r-- | lib/mesa/src/gallium/include/pipe/p_video_state.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mesa/src/gallium/include/pipe/p_video_state.h b/lib/mesa/src/gallium/include/pipe/p_video_state.h index 2ace94773..1369f1a8c 100644 --- a/lib/mesa/src/gallium/include/pipe/p_video_state.h +++ b/lib/mesa/src/gallium/include/pipe/p_video_state.h @@ -431,7 +431,7 @@ struct pipe_h264_enc_picture_desc bool not_referenced; bool enable_vui; - struct hash_table *frame_idx; + struct util_hash_table *frame_idx; }; @@ -513,7 +513,7 @@ struct pipe_h265_enc_picture_desc unsigned ref_idx_l0; unsigned ref_idx_l1; bool not_referenced; - struct hash_table *frame_idx; + struct util_hash_table *frame_idx; }; struct pipe_h265_sps |