summaryrefslogtreecommitdiff
path: root/lib/mesa/src/getopt
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2020-09-22 02:09:17 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2020-09-22 02:09:17 +0000
commit865c23c9c56f47f6cf8d73e8a6060a0c33a28b93 (patch)
treeaeed22bc39ce87dd6f09ff173c8273beaef65fe7 /lib/mesa/src/getopt
parent27e7bb02bd0f89f96d9e3b402b46c2c97ee4defe (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/getopt')
-rw-r--r--lib/mesa/src/getopt/getopt.h2
-rw-r--r--lib/mesa/src/getopt/getopt_long.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/mesa/src/getopt/getopt.h b/lib/mesa/src/getopt/getopt.h
index 89568fbf1..7f3450d00 100644
--- a/lib/mesa/src/getopt/getopt.h
+++ b/lib/mesa/src/getopt/getopt.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: getopt.h,v 1.19 2020/09/03 07:17:26 jsg Exp $ */
+/* $OpenBSD: getopt.h,v 1.20 2020/09/22 02:09:11 jsg Exp $ */
/* $NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $ */
/*-
diff --git a/lib/mesa/src/getopt/getopt_long.c b/lib/mesa/src/getopt/getopt_long.c
index b0e818c44..169c2f316 100644
--- a/lib/mesa/src/getopt/getopt_long.c
+++ b/lib/mesa/src/getopt/getopt_long.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getopt_long.c,v 1.19 2020/09/03 07:17:26 jsg Exp $ */
+/* $OpenBSD: getopt_long.c,v 1.20 2020/09/22 02:09:11 jsg Exp $ */
/* $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $ */
/*