CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: rjs
Date: Wed Nov 22 17:48:35 UTC 2023
Modified Files:
src/external/mit/xorg/lib: driver.mk libglsl.mk
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/libEGL: Makefile
src/external/mit/xorg/lib/libgbm: Makefile
Log Message:
Include some more files.
Add a build-id note to gallium.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/driver.mk
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libglsl.mk
cvs rdiff -u -r1.51 -r1.52 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libEGL/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/libgbm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/driver.mk
diff -u src/external/mit/xorg/lib/driver.mk:1.5 src/external/mit/xorg/lib/driver.mk:1.6
--- src/external/mit/xorg/lib/driver.mk:1.5 Sun Jul 16 22:20:54 2023
+++ src/external/mit/xorg/lib/driver.mk Wed Nov 22 17:48:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: driver.mk,v 1.5 2023/07/16 22:20:54 rjs Exp $
+# $NetBSD: driver.mk,v 1.6 2023/11/22 17:48:35 rjs Exp $
# stuff both dri and gallium drivers need.
@@ -28,6 +28,7 @@ SRCS.util= \
mesa-sha1.c \
os_file.c \
os_memory_fd.c \
+ os_misc.c \
os_time.c \
ralloc.c \
UTILdebug.c \
@@ -39,6 +40,7 @@ SRCS.util= \
set.c \
slab.c \
softfloat.c \
+ sparse_array.c \
string_buffer.c \
strtod.c \
u_atomic.c \
Index: src/external/mit/xorg/lib/libglsl.mk
diff -u src/external/mit/xorg/lib/libglsl.mk:1.7 src/external/mit/xorg/lib/libglsl.mk:1.8
--- src/external/mit/xorg/lib/libglsl.mk:1.7 Sun Jul 16 22:20:54 2023
+++ src/external/mit/xorg/lib/libglsl.mk Wed Nov 22 17:48:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: libglsl.mk,v 1.7 2023/07/16 22:20:54 rjs Exp $
+# $NetBSD: libglsl.mk,v 1.8 2023/11/22 17:48:35 rjs Exp $
LIBGLSL_GENERATED_CXX_FILES = \
glsl_lexer.cpp \
@@ -56,6 +56,7 @@ LIBGLSL_FILES = \
ir_function_detect_recursion.cpp \
ir_hierarchical_visitor.cpp \
ir_hv_accept.cpp \
+ ir_builder_print_visitor.cpp \
ir_print_visitor.cpp \
ir_reader.cpp \
ir_rvalue_visitor.cpp \
@@ -159,10 +160,10 @@ NIR_GENERATED_FILES = \
nir_opcodes.c \
nir_opt_algebraic.c
-#BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/compiler/nir/nir.c nir_nir.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/compiler/nir/nir.c nir_nir.c
NIR_FILES = \
- nir.c \
+ nir_nir.c \
nir_builtin_builder.c \
nir_clone.c \
nir_control_flow.c \
@@ -187,6 +188,7 @@ NIR_FILES = \
nir_lower_atomics_to_ssbo.c \
nir_lower_bit_size.c \
nir_lower_bitmap.c \
+ nir_lower_blend.c \
nir_lower_bool_to_float.c \
nir_lower_bool_to_int32.c \
nir_lower_clamp_color_outputs.c \
@@ -199,6 +201,7 @@ NIR_FILES = \
nir_lower_flatshade.c \
nir_lower_flrp.c \
nir_lower_fp16_conv.c \
+ nir_lower_fragcolor.c \
nir_lower_fragcoord_wtrans.c \
nir_lower_frexp.c \
nir_lower_global_vars_to_local.c \
@@ -209,6 +212,7 @@ NIR_FILES = \
nir_lower_indirect_derefs.c \
nir_lower_int64.c \
nir_lower_int_to_float.c \
+ nir_lower_interpolation.c \
nir_lower_io.c \
nir_lower_io_arrays_to_elements.c \
nir_lower_io_to_scalar.c \
@@ -228,6 +232,7 @@ NIR_FILES = \
nir_lower_returns.c \
nir_lower_samplers.c \
nir_lower_scratch.c \
+ nir_lower_ssbo.c \
nir_lower_subgroups.c \
nir_lower_system_values.c \
nir_lower_sysvals_to_varyings.c \
@@ -236,6 +241,7 @@ NIR_FILES = \
nir_lower_to_source_mods.c \
nir_lower_two_sided_color.c \
nir_lower_ubo_vec4.c \
+ nir_lower_undef_to_zero.c \
nir_lower_uniforms_to_ubo.c \
nir_lower_var_copies.c \
nir_lower_variable_initializers.c \
@@ -244,6 +250,7 @@ NIR_FILES = \
nir_lower_viewport_transform.c \
nir_lower_wpos_center.c \
nir_lower_wpos_ytransform.c \
+ nir_lower_wrmasks.c \
nir_metadata.c \
nir_move_vec_src_uses_to_dest.c \
nir_normalize_cubemap_coords.c \
Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.51 src/external/mit/xorg/lib/gallium/Makefile:1.52
--- src/external/mit/xorg/lib/gallium/Makefile:1.51 Sat Oct 7 12:15:52 2023
+++ src/external/mit/xorg/lib/gallium/Makefile Wed Nov 22 17:48:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2023/10/07 12:15:52 rin Exp $
+# $NetBSD: Makefile,v 1.52 2023/11/22 17:48:35 rjs Exp $
# Link the gallium mega driver.
@@ -28,6 +28,8 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libd
CFLAGS+= -pthread
LDFLAGS+= -pthread
+LDFLAGS+= -Wl,--build-id=sha1
+
# Reduce debugging for these extremely large objects.
.if ${MKDEBUG:Uno} != "no"
#CXXFLAGS+= -g1
@@ -296,7 +298,6 @@ GALLIUM_SOURCES.auxiliary/translate= \
translate_generic.c \
translate_sse.c
GALLIUM_SOURCES.auxiliary/util= \
- os_misc.c \
u_async_debug.c \
u_bitmask.c \
u_blitter.c \
Index: src/external/mit/xorg/lib/libEGL/Makefile
diff -u
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: rjs Date: Wed Nov 22 17:48:35 UTC 2023 Modified Files: src/external/mit/xorg/lib: driver.mk libglsl.mk src/external/mit/xorg/lib/gallium: Makefile src/external/mit/xorg/lib/libEGL: Makefile src/external/mit/xorg/lib/libgbm: Makefile Log Message: Include some more files. Add a build-id note to gallium. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/driver.mk cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libglsl.mk cvs rdiff -u -r1.51 -r1.52 src/external/mit/xorg/lib/gallium/Makefile cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libEGL/Makefile cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/libgbm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: riastradh
Date: Wed Nov 22 13:19:50 UTC 2023
Modified Files:
src/sys/kern: vfs_vnode.c
Log Message:
vfs(9): Make sure to kpause at least one tick, not zero.
kpause(9) forbids zero.
Local workaround for wider problem in PR kern/57718, to address
immediate symptom of crash on any system with hz=50, e.g. alpha in
qemu:
panic: kernel diagnostic assertion "timo != 0 || intr" failed: file
"/usr/src/sys/kern/kern_synch.c", line 249
XXX pullup-10
XXX pullup-9
XXX pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/sys/kern/vfs_vnode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.150 src/sys/kern/vfs_vnode.c:1.151
--- src/sys/kern/vfs_vnode.c:1.150 Mon Nov 6 12:17:50 2023
+++ src/sys/kern/vfs_vnode.c Wed Nov 22 13:19:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnode.c,v 1.150 2023/11/06 12:17:50 hannken Exp $ */
+/* $NetBSD: vfs_vnode.c,v 1.151 2023/11/22 13:19:50 riastradh Exp $ */
/*-
* Copyright (c) 1997-2011, 2019, 2020 The NetBSD Foundation, Inc.
@@ -148,7 +148,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.150 2023/11/06 12:17:50 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.151 2023/11/22 13:19:50 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_pax.h"
@@ -540,7 +540,7 @@ lru_requeue(vnode_t *vp, vnodelst_t *lis
listhd == _list[LRU_VRELE])
cv_signal(_cv);
if (d > 0 && numvnodes > desiredvnodes + desiredvnodes / 16)
- kpause("vnfull", false, mstohz(10), _lock);
+ kpause("vnfull", false, MAX(1, mstohz(10)), _lock);
mutex_exit(_lock);
}
CVS commit: src/sys/kern
Module Name:src Committed By: riastradh Date: Wed Nov 22 13:19:50 UTC 2023 Modified Files: src/sys/kern: vfs_vnode.c Log Message: vfs(9): Make sure to kpause at least one tick, not zero. kpause(9) forbids zero. Local workaround for wider problem in PR kern/57718, to address immediate symptom of crash on any system with hz=50, e.g. alpha in qemu: panic: kernel diagnostic assertion "timo != 0 || intr" failed: file "/usr/src/sys/kern/kern_synch.c", line 249 XXX pullup-10 XXX pullup-9 XXX pullup-8 To generate a diff of this commit: cvs rdiff -u -r1.150 -r1.151 src/sys/kern/vfs_vnode.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: riastradh Date: Wed Nov 22 13:18:49 UTC 2023 Modified Files: src/sys/kern: kern_synch.c Log Message: kpause(9): KASSERT -> KASSERTMSG PR kern/57718 (might help to diagnose manifestations of the problem) To generate a diff of this commit: cvs rdiff -u -r1.365 -r1.366 src/sys/kern/kern_synch.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/kern_synch.c diff -u src/sys/kern/kern_synch.c:1.365 src/sys/kern/kern_synch.c:1.366 --- src/sys/kern/kern_synch.c:1.365 Sun Oct 15 10:29:10 2023 +++ src/sys/kern/kern_synch.c Wed Nov 22 13:18:48 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_synch.c,v 1.365 2023/10/15 10:29:10 riastradh Exp $ */ +/* $NetBSD: kern_synch.c,v 1.366 2023/11/22 13:18:48 riastradh Exp $ */ /*- * Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2019, 2020, 2023 @@ -69,7 +69,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.365 2023/10/15 10:29:10 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.366 2023/11/22 13:18:48 riastradh Exp $"); #include "opt_kstack.h" #include "opt_ddb.h" @@ -246,7 +246,8 @@ kpause(const char *wmesg, bool intr, int struct lwp *l = curlwp; int error, nlocks; - KASSERT(timo != 0 || intr); + KASSERTMSG(timo != 0 || intr, "wmesg=%s intr=%s timo=%d mtx=%p", + wmesg, intr ? "true" : "false", timo, mtx); if (sleepq_dontsleep(l)) return sleepq_abort(NULL, 0);
CVS commit: src/sys/kern
Module Name:src Committed By: riastradh Date: Wed Nov 22 13:18:49 UTC 2023 Modified Files: src/sys/kern: kern_synch.c Log Message: kpause(9): KASSERT -> KASSERTMSG PR kern/57718 (might help to diagnose manifestations of the problem) To generate a diff of this commit: cvs rdiff -u -r1.365 -r1.366 src/sys/kern/kern_synch.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src
Committed By: martin
Date: Wed Nov 22 12:15:09 UTC 2023
Modified Files:
src/sys/sys: pax.h
Log Message:
PAGE_SIZE will not evaluate to a vaddr_t expression on all architectures
(e.g. sparc), so cast it to that.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/sys/pax.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/pax.h
diff -u src/sys/sys/pax.h:1.28 src/sys/sys/pax.h:1.29
--- src/sys/sys/pax.h:1.28 Tue Nov 21 14:35:36 2023
+++ src/sys/sys/pax.h Wed Nov 22 12:15:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pax.h,v 1.28 2023/11/21 14:35:36 riastradh Exp $ */
+/* $NetBSD: pax.h,v 1.29 2023/11/22 12:15:09 martin Exp $ */
/*-
* Copyright (c) 2006 Elad Efrat
@@ -150,7 +150,7 @@ pax_aslr_stack_gap(struct exec_package *
static inline vaddr_t
pax_aslr_exec_offset(struct exec_package *epp, vaddr_t align)
{
- return MAX(align, PAGE_SIZE);
+ return MAX(align, (vaddr_t)PAGE_SIZE);
}
static inline voff_t
pax_aslr_rtld_offset(struct exec_package *epp, vaddr_t align, int use_topdown)
CVS commit: src/sys/sys
Module Name:src Committed By: martin Date: Wed Nov 22 12:15:09 UTC 2023 Modified Files: src/sys/sys: pax.h Log Message: PAGE_SIZE will not evaluate to a vaddr_t expression on all architectures (e.g. sparc), so cast it to that. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/sys/pax.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
