From 865c23c9c56f47f6cf8d73e8a6060a0c33a28b93 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Tue, 22 Sep 2020 02:09:17 +0000 Subject: 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. --- lib/mesa/src/vulkan/util/gen_enum_to_str.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/mesa/src/vulkan/util') diff --git a/lib/mesa/src/vulkan/util/gen_enum_to_str.py b/lib/mesa/src/vulkan/util/gen_enum_to_str.py index ebaf2a1a0..035aa02a1 100644 --- a/lib/mesa/src/vulkan/util/gen_enum_to_str.py +++ b/lib/mesa/src/vulkan/util/gen_enum_to_str.py @@ -25,7 +25,7 @@ from __future__ import print_function import argparse import os import textwrap -import xml.etree.ElementTree as et +import xml.etree.cElementTree as et from mako.template import Template -- cgit v1.2.3