CVS commit: src/sys/arch/arm/xilinx

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Fri Nov 11 20:29:47 UTC 2022

Modified Files:
src/sys/arch/arm/xilinx: zynq7000_clkc.c

Log Message:
Support PCAL clock control


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/xilinx/zynq7000_clkc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/arm/xilinx

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Fri Nov 11 20:29:47 UTC 2022

Modified Files:
src/sys/arch/arm/xilinx: zynq7000_clkc.c

Log Message:
Support PCAL clock control


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/xilinx/zynq7000_clkc.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/arch/arm/xilinx/zynq7000_clkc.c
diff -u src/sys/arch/arm/xilinx/zynq7000_clkc.c:1.4 src/sys/arch/arm/xilinx/zynq7000_clkc.c:1.5
--- src/sys/arch/arm/xilinx/zynq7000_clkc.c:1.4	Sat Nov  5 17:28:55 2022
+++ src/sys/arch/arm/xilinx/zynq7000_clkc.c	Fri Nov 11 20:29:47 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: zynq7000_clkc.c,v 1.4 2022/11/05 17:28:55 jmcneill Exp $ */
+/* $NetBSD: zynq7000_clkc.c,v 1.5 2022/11/11 20:29:47 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2022 Jared McNeill 
@@ -28,7 +28,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: zynq7000_clkc.c,v 1.4 2022/11/05 17:28:55 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zynq7000_clkc.c,v 1.5 2022/11/11 20:29:47 jmcneill Exp $");
 
 #include 
 #include 
@@ -62,6 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: zynq7000_clk
 #define	 SDI0_CPU_1XCLKACT	__BIT(10)
 #define	SDIO_CLK_CTRL	0x150
 #define	UART_CLK_CTRL	0x154
+#define	PCAP_CLK_CTRL	0x168
 #define	 CLK_CTRL_DIVISOR	__BITS(13,8)
 #define	 CLK_CTRL_SRCSEL	__BITS(5,4)
 #define	 CLK_CTRL_CLKACT1	__BIT(1)
@@ -247,6 +248,8 @@ zynq7000_clkc_clk_get_rate(void *priv, s
 	} else if (clk == &sc->sc_clk[clkid_uart0] ||
 		   clk == &sc->sc_clk[clkid_uart1]) {
 		return zynq7000_clkc_get_rate_iop(sc, UART_CLK_CTRL);
+	} else if (clk == &sc->sc_clk[clkid_pcap]) {
+		return zynq7000_clkc_get_rate_iop(sc, PCAP_CLK_CTRL);
 	} else if (clk == &sc->sc_clk[clkid_uart0_aper] ||
 		   clk == &sc->sc_clk[clkid_uart1_aper] ||
 		   clk == &sc->sc_clk[clkid_i2c0_aper] ||
@@ -290,6 +293,9 @@ zynq7000_clkc_clk_enable(void *priv, str
 	} else if (clk == &sc->sc_clk[clkid_uart1]) {
 		reg = UART_CLK_CTRL;
 		mask = CLK_CTRL_CLKACT1;
+	} else if (clk == &sc->sc_clk[clkid_pcap]) {
+		reg = PCAP_CLK_CTRL;
+		mask = CLK_CTRL_CLKACT0;
 	} else if (clk == &sc->sc_clk[clkid_sdio0_aper]) {
 		reg = APER_CLK_CTRL;
 		mask = SDI0_CPU_1XCLKACT;

CVS commit: src/sys/arch

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Fri Nov 11 20:31:30 UTC 2022

Modified Files:
src/sys/arch/arm/xilinx: files.zynq
src/sys/arch/evbarm/conf: GENERIC
Added Files:
src/sys/arch/arm/xilinx: zynq_xadc.c

Log Message:
Add support for Xilinx 7-series ADC.

The temperature and voltage sensors are exposed with sysmon:

# envstat -d zynqxadc0
   Current  CritMax  WarnMax  WarnMin  CritMin  Unit
temperature:67.426  degC
 vccint: 1.010 V
 vccaux: 1.801 V
  vp/vn: 0.011 V
  vrefp: 1.250 V
  vrefn: 0.004 V
vccbram: 1.009 V
vccpint: 1.009 V
vccpaux: 1.799 V
   vcco_ddr: 1.500 V


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/xilinx/files.zynq
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/xilinx/zynq_xadc.c
cvs rdiff -u -r1.114 -r1.115 src/sys/arch/evbarm/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Fri Nov 11 20:31:30 UTC 2022

Modified Files:
src/sys/arch/arm/xilinx: files.zynq
src/sys/arch/evbarm/conf: GENERIC
Added Files:
src/sys/arch/arm/xilinx: zynq_xadc.c

Log Message:
Add support for Xilinx 7-series ADC.

The temperature and voltage sensors are exposed with sysmon:

# envstat -d zynqxadc0
   Current  CritMax  WarnMax  WarnMin  CritMin  Unit
temperature:67.426  degC
 vccint: 1.010 V
 vccaux: 1.801 V
  vp/vn: 0.011 V
  vrefp: 1.250 V
  vrefn: 0.004 V
vccbram: 1.009 V
vccpint: 1.009 V
vccpaux: 1.799 V
   vcco_ddr: 1.500 V


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/xilinx/files.zynq
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/xilinx/zynq_xadc.c
cvs rdiff -u -r1.114 -r1.115 src/sys/arch/evbarm/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/arm/xilinx/files.zynq
diff -u src/sys/arch/arm/xilinx/files.zynq:1.4 src/sys/arch/arm/xilinx/files.zynq:1.5
--- src/sys/arch/arm/xilinx/files.zynq:1.4	Thu Oct 27 09:41:28 2022
+++ src/sys/arch/arm/xilinx/files.zynq	Fri Nov 11 20:31:30 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: files.zynq,v 1.4 2022/10/27 09:41:28 jmcneill Exp $
+#	$NetBSD: files.zynq,v 1.5 2022/11/11 20:31:30 jmcneill Exp $
 #
 # Configuration info for Xilinx Zynq-7000 SoC
 #
@@ -37,3 +37,8 @@ file	arch/arm/xilinx/zynq_cemac.c		cemac
 attach	ehci at fdt with zynqusb
 file	arch/arm/xilinx/zynq_usb.c		zynqusb
 file	arch/arm/xilinx/zynq7000_usb.c		zynqusb
+
+# Xilinx 7 series ADC
+device	zynqxadc: sysmon_envsys
+attach	zynqxadc at fdt
+file	arch/arm/xilinx/zynq_xadc.c		zynqxadc

Index: src/sys/arch/evbarm/conf/GENERIC
diff -u src/sys/arch/evbarm/conf/GENERIC:1.114 src/sys/arch/evbarm/conf/GENERIC:1.115
--- src/sys/arch/evbarm/conf/GENERIC:1.114	Sat Nov  5 17:32:03 2022
+++ src/sys/arch/evbarm/conf/GENERIC	Fri Nov 11 20:31:30 2022
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC,v 1.114 2022/11/05 17:32:03 jmcneill Exp $
+#	$NetBSD: GENERIC,v 1.115 2022/11/11 20:31:30 jmcneill Exp $
 #
 #	GENERIC ARM (aarch32) kernel
 #
@@ -436,6 +436,7 @@ tegrartc* 	at fdt?			# NVIDIA Tegra RTC
 
 # Thermal sensor
 sunxithermal* 	at fdt?			# Thermal sensor controller
+zynqxadc*	at fdt?			# Xilinx 7 series ADC
 
 # BCM2835 VCHIQ, etc
 vchiq0 		at fdt?

Added files:

Index: src/sys/arch/arm/xilinx/zynq_xadc.c
diff -u /dev/null src/sys/arch/arm/xilinx/zynq_xadc.c:1.1
--- /dev/null	Fri Nov 11 20:31:30 2022
+++ src/sys/arch/arm/xilinx/zynq_xadc.c	Fri Nov 11 20:31:30 2022
@@ -0,0 +1,350 @@
+/* $NetBSD: zynq_xadc.c,v 1.1 2022/11/11 20:31:30 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2022 Jared McNeill 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Xilinx 7 series ADC ("XADC")
+ *
+ * Documentation can be found on the Xilinx web site:
+ *  - Zynq-7000 SoC Technical Reference Manual UG585 (v1.13)
+ *  - XADC User Guide 3 UG480 (v1.11)
+ */
+
+#include 
+__KERNEL_RCSID(0, "$NetBSD: zynq_xadc.c,v 1.1 2022/11/11 20:31:30 jmcneill Exp $");
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+/* PS-XADC interface registers */
+#defin

CVS import: xsrc/external/mit/rgb/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:06:31 UTC 2022

Update of /cvsroot/xsrc/external/mit/rgb/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv1197

Log Message:
initial import of rgb-1.1.0

Status:

Vendor Tag: xorg
Release Tags:   rgb-1-1-0

U xsrc/external/mit/rgb/dist/configure
N xsrc/external/mit/rgb/dist/README.md
U xsrc/external/mit/rgb/dist/showrgb.c
U xsrc/external/mit/rgb/dist/rgb.txt
U xsrc/external/mit/rgb/dist/ChangeLog
U xsrc/external/mit/rgb/dist/config.guess
U xsrc/external/mit/rgb/dist/config.h.in
U xsrc/external/mit/rgb/dist/install-sh
U xsrc/external/mit/rgb/dist/INSTALL
U xsrc/external/mit/rgb/dist/aclocal.m4
U xsrc/external/mit/rgb/dist/rgb.c
U xsrc/external/mit/rgb/dist/depcomp
U xsrc/external/mit/rgb/dist/Makefile.am
U xsrc/external/mit/rgb/dist/missing
U xsrc/external/mit/rgb/dist/COPYING
U xsrc/external/mit/rgb/dist/configure.ac
U xsrc/external/mit/rgb/dist/config.sub
U xsrc/external/mit/rgb/dist/Makefile.in
U xsrc/external/mit/rgb/dist/compile
U xsrc/external/mit/rgb/dist/AUTHORS
U xsrc/external/mit/rgb/dist/others/old-rgb.txt
U xsrc/external/mit/rgb/dist/others/raveling.txt
U xsrc/external/mit/rgb/dist/others/README
U xsrc/external/mit/rgb/dist/others/thomas.txt
U xsrc/external/mit/rgb/dist/man/Makefile.am
U xsrc/external/mit/rgb/dist/man/Makefile.in
U xsrc/external/mit/rgb/dist/man/showrgb.man
U xsrc/external/mit/rgb/dist/man/rgb.man

No conflicts created by this import

CVS import: xsrc/external/mit/sessreg/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:06:32 UTC 2022

Update of /cvsroot/xsrc/external/mit/sessreg/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv24368

Log Message:
initial import of sessreg-1.1.3

Status:

Vendor Tag: xorg
Release Tags:   sessreg-1-1-3

U xsrc/external/mit/sessreg/dist/Makefile.in
U xsrc/external/mit/sessreg/dist/sessreg.h
U xsrc/external/mit/sessreg/dist/INSTALL
U xsrc/external/mit/sessreg/dist/Makefile.am
U xsrc/external/mit/sessreg/dist/config.guess
U xsrc/external/mit/sessreg/dist/config.sub
U xsrc/external/mit/sessreg/dist/depcomp
U xsrc/external/mit/sessreg/dist/missing
U xsrc/external/mit/sessreg/dist/sessreg.c
U xsrc/external/mit/sessreg/dist/configure.ac
U xsrc/external/mit/sessreg/dist/config.h.in
U xsrc/external/mit/sessreg/dist/ChangeLog
U xsrc/external/mit/sessreg/dist/compile
U xsrc/external/mit/sessreg/dist/AUTHORS
U xsrc/external/mit/sessreg/dist/README.md
U xsrc/external/mit/sessreg/dist/install-sh
U xsrc/external/mit/sessreg/dist/configure
U xsrc/external/mit/sessreg/dist/COPYING
U xsrc/external/mit/sessreg/dist/aclocal.m4
U xsrc/external/mit/sessreg/dist/man/sessreg.man
U xsrc/external/mit/sessreg/dist/man/filenames.sed.c
U xsrc/external/mit/sessreg/dist/man/Makefile.in
U xsrc/external/mit/sessreg/dist/man/Makefile.am

No conflicts created by this import

CVS import: xsrc/external/mit/rgb/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:06:31 UTC 2022

Update of /cvsroot/xsrc/external/mit/rgb/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv1197

Log Message:
initial import of rgb-1.1.0

Status:

Vendor Tag: xorg
Release Tags:   rgb-1-1-0

U xsrc/external/mit/rgb/dist/configure
N xsrc/external/mit/rgb/dist/README.md
U xsrc/external/mit/rgb/dist/showrgb.c
U xsrc/external/mit/rgb/dist/rgb.txt
U xsrc/external/mit/rgb/dist/ChangeLog
U xsrc/external/mit/rgb/dist/config.guess
U xsrc/external/mit/rgb/dist/config.h.in
U xsrc/external/mit/rgb/dist/install-sh
U xsrc/external/mit/rgb/dist/INSTALL
U xsrc/external/mit/rgb/dist/aclocal.m4
U xsrc/external/mit/rgb/dist/rgb.c
U xsrc/external/mit/rgb/dist/depcomp
U xsrc/external/mit/rgb/dist/Makefile.am
U xsrc/external/mit/rgb/dist/missing
U xsrc/external/mit/rgb/dist/COPYING
U xsrc/external/mit/rgb/dist/configure.ac
U xsrc/external/mit/rgb/dist/config.sub
U xsrc/external/mit/rgb/dist/Makefile.in
U xsrc/external/mit/rgb/dist/compile
U xsrc/external/mit/rgb/dist/AUTHORS
U xsrc/external/mit/rgb/dist/others/old-rgb.txt
U xsrc/external/mit/rgb/dist/others/raveling.txt
U xsrc/external/mit/rgb/dist/others/README
U xsrc/external/mit/rgb/dist/others/thomas.txt
U xsrc/external/mit/rgb/dist/man/Makefile.am
U xsrc/external/mit/rgb/dist/man/Makefile.in
U xsrc/external/mit/rgb/dist/man/showrgb.man
U xsrc/external/mit/rgb/dist/man/rgb.man

No conflicts created by this import

CVS import: xsrc/external/mit/sessreg/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:06:32 UTC 2022

Update of /cvsroot/xsrc/external/mit/sessreg/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv24368

Log Message:
initial import of sessreg-1.1.3

Status:

Vendor Tag: xorg
Release Tags:   sessreg-1-1-3

U xsrc/external/mit/sessreg/dist/Makefile.in
U xsrc/external/mit/sessreg/dist/sessreg.h
U xsrc/external/mit/sessreg/dist/INSTALL
U xsrc/external/mit/sessreg/dist/Makefile.am
U xsrc/external/mit/sessreg/dist/config.guess
U xsrc/external/mit/sessreg/dist/config.sub
U xsrc/external/mit/sessreg/dist/depcomp
U xsrc/external/mit/sessreg/dist/missing
U xsrc/external/mit/sessreg/dist/sessreg.c
U xsrc/external/mit/sessreg/dist/configure.ac
U xsrc/external/mit/sessreg/dist/config.h.in
U xsrc/external/mit/sessreg/dist/ChangeLog
U xsrc/external/mit/sessreg/dist/compile
U xsrc/external/mit/sessreg/dist/AUTHORS
U xsrc/external/mit/sessreg/dist/README.md
U xsrc/external/mit/sessreg/dist/install-sh
U xsrc/external/mit/sessreg/dist/configure
U xsrc/external/mit/sessreg/dist/COPYING
U xsrc/external/mit/sessreg/dist/aclocal.m4
U xsrc/external/mit/sessreg/dist/man/sessreg.man
U xsrc/external/mit/sessreg/dist/man/filenames.sed.c
U xsrc/external/mit/sessreg/dist/man/Makefile.in
U xsrc/external/mit/sessreg/dist/man/Makefile.am

No conflicts created by this import

CVS import: xsrc/external/mit/xfsinfo/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:06:34 UTC 2022

Update of /cvsroot/xsrc/external/mit/xfsinfo/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv23409

Log Message:
initial import of xfsinfo-1.0.7

Status:

Vendor Tag: xorg
Release Tags:   xfsinfo-1-0-7

U xsrc/external/mit/xfsinfo/dist/README.md
U xsrc/external/mit/xfsinfo/dist/depcomp
U xsrc/external/mit/xfsinfo/dist/missing
U xsrc/external/mit/xfsinfo/dist/configure
U xsrc/external/mit/xfsinfo/dist/aclocal.m4
U xsrc/external/mit/xfsinfo/dist/ChangeLog
U xsrc/external/mit/xfsinfo/dist/install-sh
U xsrc/external/mit/xfsinfo/dist/configure.ac
U xsrc/external/mit/xfsinfo/dist/config.h.in
C xsrc/external/mit/xfsinfo/dist/compile
U xsrc/external/mit/xfsinfo/dist/COPYING
U xsrc/external/mit/xfsinfo/dist/config.sub
U xsrc/external/mit/xfsinfo/dist/Makefile.am
U xsrc/external/mit/xfsinfo/dist/config.guess
U xsrc/external/mit/xfsinfo/dist/INSTALL
U xsrc/external/mit/xfsinfo/dist/xfsinfo.c
U xsrc/external/mit/xfsinfo/dist/Makefile.in
U xsrc/external/mit/xfsinfo/dist/man/Makefile.am
U xsrc/external/mit/xfsinfo/dist/man/xfsinfo.man
U xsrc/external/mit/xfsinfo/dist/man/Makefile.in

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xfsinfo/dist

CVS import: xsrc/external/mit/xfsinfo/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:06:34 UTC 2022

Update of /cvsroot/xsrc/external/mit/xfsinfo/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv23409

Log Message:
initial import of xfsinfo-1.0.7

Status:

Vendor Tag: xorg
Release Tags:   xfsinfo-1-0-7

U xsrc/external/mit/xfsinfo/dist/README.md
U xsrc/external/mit/xfsinfo/dist/depcomp
U xsrc/external/mit/xfsinfo/dist/missing
U xsrc/external/mit/xfsinfo/dist/configure
U xsrc/external/mit/xfsinfo/dist/aclocal.m4
U xsrc/external/mit/xfsinfo/dist/ChangeLog
U xsrc/external/mit/xfsinfo/dist/install-sh
U xsrc/external/mit/xfsinfo/dist/configure.ac
U xsrc/external/mit/xfsinfo/dist/config.h.in
C xsrc/external/mit/xfsinfo/dist/compile
U xsrc/external/mit/xfsinfo/dist/COPYING
U xsrc/external/mit/xfsinfo/dist/config.sub
U xsrc/external/mit/xfsinfo/dist/Makefile.am
U xsrc/external/mit/xfsinfo/dist/config.guess
U xsrc/external/mit/xfsinfo/dist/INSTALL
U xsrc/external/mit/xfsinfo/dist/xfsinfo.c
U xsrc/external/mit/xfsinfo/dist/Makefile.in
U xsrc/external/mit/xfsinfo/dist/man/Makefile.am
U xsrc/external/mit/xfsinfo/dist/man/xfsinfo.man
U xsrc/external/mit/xfsinfo/dist/man/Makefile.in

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xfsinfo/dist

CVS import: xsrc/external/mit/xsetroot/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:06:35 UTC 2022

Update of /cvsroot/xsrc/external/mit/xsetroot/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv27398

Log Message:
initial import of xsetroot-1.1.3

Status:

Vendor Tag: xorg
Release Tags:   xsetroot-1-1-3

U xsrc/external/mit/xsetroot/dist/missing
U xsrc/external/mit/xsetroot/dist/xsetroot.c
U xsrc/external/mit/xsetroot/dist/Makefile.am
U xsrc/external/mit/xsetroot/dist/depcomp
U xsrc/external/mit/xsetroot/dist/config.guess
U xsrc/external/mit/xsetroot/dist/Makefile.in
U xsrc/external/mit/xsetroot/dist/compile
U xsrc/external/mit/xsetroot/dist/config.sub
U xsrc/external/mit/xsetroot/dist/COPYING
U xsrc/external/mit/xsetroot/dist/ChangeLog
N xsrc/external/mit/xsetroot/dist/README.md
U xsrc/external/mit/xsetroot/dist/configure.ac
U xsrc/external/mit/xsetroot/dist/configure
U xsrc/external/mit/xsetroot/dist/INSTALL
U xsrc/external/mit/xsetroot/dist/install-sh
U xsrc/external/mit/xsetroot/dist/config.h.in
U xsrc/external/mit/xsetroot/dist/aclocal.m4
U xsrc/external/mit/xsetroot/dist/man/Makefile.am
U xsrc/external/mit/xsetroot/dist/man/Makefile.in
U xsrc/external/mit/xsetroot/dist/man/xsetroot.man

No conflicts created by this import

CVS import: xsrc/external/mit/xsetroot/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:06:35 UTC 2022

Update of /cvsroot/xsrc/external/mit/xsetroot/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv27398

Log Message:
initial import of xsetroot-1.1.3

Status:

Vendor Tag: xorg
Release Tags:   xsetroot-1-1-3

U xsrc/external/mit/xsetroot/dist/missing
U xsrc/external/mit/xsetroot/dist/xsetroot.c
U xsrc/external/mit/xsetroot/dist/Makefile.am
U xsrc/external/mit/xsetroot/dist/depcomp
U xsrc/external/mit/xsetroot/dist/config.guess
U xsrc/external/mit/xsetroot/dist/Makefile.in
U xsrc/external/mit/xsetroot/dist/compile
U xsrc/external/mit/xsetroot/dist/config.sub
U xsrc/external/mit/xsetroot/dist/COPYING
U xsrc/external/mit/xsetroot/dist/ChangeLog
N xsrc/external/mit/xsetroot/dist/README.md
U xsrc/external/mit/xsetroot/dist/configure.ac
U xsrc/external/mit/xsetroot/dist/configure
U xsrc/external/mit/xsetroot/dist/INSTALL
U xsrc/external/mit/xsetroot/dist/install-sh
U xsrc/external/mit/xsetroot/dist/config.h.in
U xsrc/external/mit/xsetroot/dist/aclocal.m4
U xsrc/external/mit/xsetroot/dist/man/Makefile.am
U xsrc/external/mit/xsetroot/dist/man/Makefile.in
U xsrc/external/mit/xsetroot/dist/man/xsetroot.man

No conflicts created by this import

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:08:51 UTC 2022

Modified Files:
xsrc/external/mit/sessreg/include: config.h
xsrc/external/mit/xfsinfo/dist: compile
Removed Files:
xsrc/external/mit/rgb/dist: README
xsrc/external/mit/xsetroot/dist: README

Log Message:
merge rgb 1.1.0, sessreg 1.1.3, xfsinfo 1.0.7, and xsetroot 1.1.3


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/rgb/dist/README
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/sessreg/include/config.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xfsinfo/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xsetroot/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:08:51 UTC 2022

Modified Files:
xsrc/external/mit/sessreg/include: config.h
xsrc/external/mit/xfsinfo/dist: compile
Removed Files:
xsrc/external/mit/rgb/dist: README
xsrc/external/mit/xsetroot/dist: README

Log Message:
merge rgb 1.1.0, sessreg 1.1.3, xfsinfo 1.0.7, and xsetroot 1.1.3


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/rgb/dist/README
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/sessreg/include/config.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xfsinfo/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xsetroot/dist/README

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/sessreg/include/config.h
diff -u xsrc/external/mit/sessreg/include/config.h:1.5 xsrc/external/mit/sessreg/include/config.h:1.6
--- xsrc/external/mit/sessreg/include/config.h:1.5	Mon Jul  8 20:41:24 2019
+++ xsrc/external/mit/sessreg/include/config.h	Fri Nov 11 23:08:51 2022
@@ -59,7 +59,7 @@
 #define PACKAGE_NAME "sessreg"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "sessreg 1.1.1"
+#define PACKAGE_STRING "sessreg 1.1.3"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "sessreg"
@@ -68,7 +68,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.1"
+#define PACKAGE_VERSION "1.1.3"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
@@ -105,7 +105,7 @@
 
 
 /* Version number of package */
-#define VERSION "1.1.0"
+#define VERSION "1.1.3"
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */

Index: xsrc/external/mit/xfsinfo/dist/compile
diff -u xsrc/external/mit/xfsinfo/dist/compile:1.4 xsrc/external/mit/xfsinfo/dist/compile:1.5
--- xsrc/external/mit/xfsinfo/dist/compile:1.4	Sun Mar  3 08:17:43 2019
+++ xsrc/external/mit/xfsinfo/dist/compile	Fri Nov 11 23:08:51 2022
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey .
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	file_conv=mingw
 	;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	file_conv=cygwin
 	;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
 echo "compile $scriptversion"
 exit $?
 ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
 func_cl_wrapper "$@"  # Doesn't return...
 ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

CVS import: xsrc/external/mit/xf86-input-mouse/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:31:21 UTC 2022

Update of /cvsroot/xsrc/external/mit/xf86-input-mouse/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv5152

Log Message:
initial import of xf86-input-mouse-1.9.4

Status:

Vendor Tag: xorg
Release Tags:   xf86-input-mouse-1-9-4

U xsrc/external/mit/xf86-input-mouse/dist/Makefile.in
U xsrc/external/mit/xf86-input-mouse/dist/README
U xsrc/external/mit/xf86-input-mouse/dist/INSTALL
U xsrc/external/mit/xf86-input-mouse/dist/config.guess
U xsrc/external/mit/xf86-input-mouse/dist/Makefile.am
U xsrc/external/mit/xf86-input-mouse/dist/configure
U xsrc/external/mit/xf86-input-mouse/dist/config.sub
U xsrc/external/mit/xf86-input-mouse/dist/ChangeLog
U xsrc/external/mit/xf86-input-mouse/dist/COPYING
U xsrc/external/mit/xf86-input-mouse/dist/xorg-mouse.pc.in
U xsrc/external/mit/xf86-input-mouse/dist/config.h.in
U xsrc/external/mit/xf86-input-mouse/dist/compile
U xsrc/external/mit/xf86-input-mouse/dist/aclocal.m4
U xsrc/external/mit/xf86-input-mouse/dist/configure.ac
U xsrc/external/mit/xf86-input-mouse/dist/install-sh
U xsrc/external/mit/xf86-input-mouse/dist/depcomp
U xsrc/external/mit/xf86-input-mouse/dist/missing
U xsrc/external/mit/xf86-input-mouse/dist/ltmain.sh
U xsrc/external/mit/xf86-input-mouse/dist/man/Makefile.in
U xsrc/external/mit/xf86-input-mouse/dist/man/Makefile.am
U xsrc/external/mit/xf86-input-mouse/dist/man/mousedrv.man
U xsrc/external/mit/xf86-input-mouse/dist/include/xf86-mouse-properties.h
U xsrc/external/mit/xf86-input-mouse/dist/include/Makefile.in
U xsrc/external/mit/xf86-input-mouse/dist/include/Makefile.am
U xsrc/external/mit/xf86-input-mouse/dist/src/mousePriv.h
C xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
U xsrc/external/mit/xf86-input-mouse/dist/src/lnx_mouse.c
U xsrc/external/mit/xf86-input-mouse/dist/src/hurd_mouse.c
U xsrc/external/mit/xf86-input-mouse/dist/src/Makefile.am
U xsrc/external/mit/xf86-input-mouse/dist/src/mouse.h
U xsrc/external/mit/xf86-input-mouse/dist/src/sun_mouse.c
U xsrc/external/mit/xf86-input-mouse/dist/src/Makefile.in
C xsrc/external/mit/xf86-input-mouse/dist/src/pnp.c
U xsrc/external/mit/xf86-input-mouse/dist/src/compat-api.h
C xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c

3 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-input-mouse/dist

CVS import: xsrc/external/mit/xf86-input-mouse/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:31:21 UTC 2022

Update of /cvsroot/xsrc/external/mit/xf86-input-mouse/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv5152

Log Message:
initial import of xf86-input-mouse-1.9.4

Status:

Vendor Tag: xorg
Release Tags:   xf86-input-mouse-1-9-4

U xsrc/external/mit/xf86-input-mouse/dist/Makefile.in
U xsrc/external/mit/xf86-input-mouse/dist/README
U xsrc/external/mit/xf86-input-mouse/dist/INSTALL
U xsrc/external/mit/xf86-input-mouse/dist/config.guess
U xsrc/external/mit/xf86-input-mouse/dist/Makefile.am
U xsrc/external/mit/xf86-input-mouse/dist/configure
U xsrc/external/mit/xf86-input-mouse/dist/config.sub
U xsrc/external/mit/xf86-input-mouse/dist/ChangeLog
U xsrc/external/mit/xf86-input-mouse/dist/COPYING
U xsrc/external/mit/xf86-input-mouse/dist/xorg-mouse.pc.in
U xsrc/external/mit/xf86-input-mouse/dist/config.h.in
U xsrc/external/mit/xf86-input-mouse/dist/compile
U xsrc/external/mit/xf86-input-mouse/dist/aclocal.m4
U xsrc/external/mit/xf86-input-mouse/dist/configure.ac
U xsrc/external/mit/xf86-input-mouse/dist/install-sh
U xsrc/external/mit/xf86-input-mouse/dist/depcomp
U xsrc/external/mit/xf86-input-mouse/dist/missing
U xsrc/external/mit/xf86-input-mouse/dist/ltmain.sh
U xsrc/external/mit/xf86-input-mouse/dist/man/Makefile.in
U xsrc/external/mit/xf86-input-mouse/dist/man/Makefile.am
U xsrc/external/mit/xf86-input-mouse/dist/man/mousedrv.man
U xsrc/external/mit/xf86-input-mouse/dist/include/xf86-mouse-properties.h
U xsrc/external/mit/xf86-input-mouse/dist/include/Makefile.in
U xsrc/external/mit/xf86-input-mouse/dist/include/Makefile.am
U xsrc/external/mit/xf86-input-mouse/dist/src/mousePriv.h
C xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
U xsrc/external/mit/xf86-input-mouse/dist/src/lnx_mouse.c
U xsrc/external/mit/xf86-input-mouse/dist/src/hurd_mouse.c
U xsrc/external/mit/xf86-input-mouse/dist/src/Makefile.am
U xsrc/external/mit/xf86-input-mouse/dist/src/mouse.h
U xsrc/external/mit/xf86-input-mouse/dist/src/sun_mouse.c
U xsrc/external/mit/xf86-input-mouse/dist/src/Makefile.in
C xsrc/external/mit/xf86-input-mouse/dist/src/pnp.c
U xsrc/external/mit/xf86-input-mouse/dist/src/compat-api.h
C xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c

3 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-input-mouse/dist

CVS commit: xsrc/external/mit/xf86-input-mouse/dist/src

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:50:07 UTC 2022

Modified Files:
xsrc/external/mit/xf86-input-mouse/dist/src: bsd_mouse.c mouse.c pnp.c

Log Message:
merge xf86-input-mouse 1.9.4.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-input-mouse/dist/src/pnp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c
diff -u xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c:1.6 xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c:1.7
--- xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c:1.6	Sat Oct 10 21:50:53 2020
+++ xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c	Fri Nov 11 23:50:07 2022
@@ -61,7 +61,7 @@
 
 #define HID_USAGE2(p,u) (((p) << 16) | u)
 
-/* The UMS mices have middle button as number 3 */
+/* The UMS mice have middle button as number 3 */
 #define UMS_BUT(i) ((i) == 0 ? 2 : (i) == 1 ? 0 : (i) == 2 ? 1 : (i))
 #endif /* USBMOUSE_SUPPORT */
 
@@ -83,7 +83,7 @@ static const char *mouseDevs[] = {
 NULL
 };
 #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
-/* Only wsmouse mices are autoconfigured for now on OpenBSD */
+/* Only wsmouse mice are autoconfigured for now on OpenBSD */
 #define DEFAULT_WSMOUSE_DEV "/dev/wsmouse"
 #define DEFAULT_WSMOUSE0_DEV"/dev/wsmouse0"
 
@@ -232,7 +232,7 @@ SetSysMouseRes(InputInfoPtr pInfo, const
 (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
 /*
  * As the FreeBSD sysmouse driver defaults to protocol level 0
- * everytime it is opened we enforce protocol level 1 again at
+ * every time it is opened we enforce protocol level 1 again at
  * this point.
  */
 mode.level = 1;
@@ -604,8 +604,10 @@ usbMouseProc(DeviceIntPtr pPointer, int 
 pInfo->fd = -1;
 } else {
 xf86FlushInput(pInfo->fd);
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 23
 if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadInput,
   pInfo))
+#endif
 AddEnabledDevice(pInfo->fd);
 }
 }
@@ -726,7 +728,7 @@ usbPreInit(InputInfoPtr pInfo, const cha
 return FALSE;
 }
 }
-/* Get USB informations */
+/* Get USB information */
 reportDesc = hid_get_report_desc(pInfo->fd);
 /* Get packet size & iid */
 #ifdef USB_NEW_HID

Index: xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
diff -u xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.19 xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.20
--- xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.19	Mon Dec 31 12:01:31 2018
+++ xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c	Fri Nov 11 23:50:07 2022
@@ -38,7 +38,7 @@
  */
 
 /*
- * [PME-02/08/11] Added suport for drag lock buttons
+ * [PME-02/08/11] Added support for drag lock buttons
  * for use with 4 button trackballs for convenience
  * and to help limited dexterity persons
  */
@@ -176,12 +176,18 @@ static Bool autoGood(MouseDevPtr pMse);
 
 #undef MOUSE
 _X_EXPORT InputDriverRec MOUSE = {
-1,
-"mouse",
-NULL,
-MousePreInit,
-NULL,
-NULL,
+	.driverVersion		= 1,
+	.driverName		= "mouse",
+	.Identify		= NULL,
+	.PreInit		= MousePreInit,
+	.UnInit			= NULL,
+	.module			= NULL,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
+	.default_options	= NULL,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 21
+	.capabilities		= 0
+#endif
+#endif
 };
 
 #define RETRY_COUNT 4
@@ -819,8 +825,8 @@ InitProtocols(void)
 !osInfo->CheckProtocol(mouseProtocols[i].name))
 mouseProtocols[i].id = PROT_UNSUP;
 
-#ifdef __NetBSD__
 /* NetBSD uses PROT_BM for "PS/2". */
+#if defined(__NetBSD__)
 for (i = 0; mouseProtocols[i].name; i++)
 if (mouseProtocols[i].id == PROT_PS2)
 mouseProtocols[i].id = PROT_BM;
@@ -1195,7 +1201,7 @@ MouseReadInput(InputInfoPtr pInfo)
 /*
  * Set blocking to -1 on the first call because we know there is data to
  * read. Xisb automatically clears it after one successful read so that
- * succeeding reads are preceeded by a select with a 0 timeout to prevent
+ * succeeding reads are preceded by a select with a 0 timeout to prevent
  * read from blocking indefinitely.
  */
 XisbBlockDuration(pMse->buffer, -1);
@@ -1255,11 +1261,11 @@ MouseReadInput(InputInfoPtr pInfo)
  */
 /*
  * [KAZU-030897]
- * Receive the fourth byte only when preceeding three bytes
+ * Receive the fou

CVS commit: xsrc/external/mit/xf86-input-mouse/dist/src

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Nov 11 23:50:07 UTC 2022

Modified Files:
xsrc/external/mit/xf86-input-mouse/dist/src: bsd_mouse.c mouse.c pnp.c

Log Message:
merge xf86-input-mouse 1.9.4.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-input-mouse/dist/src/pnp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS import: xsrc/external/mit/libpciaccess/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 01:44:50 UTC 2022

Update of /cvsroot/xsrc/external/mit/libpciaccess/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv4315

Log Message:
initial import of libpciaccess-0.17

Status:

Vendor Tag: xorg
Release Tags:   libpciaccess-0-17

U xsrc/external/mit/libpciaccess/dist/pciaccess.pc.in
U xsrc/external/mit/libpciaccess/dist/configure
U xsrc/external/mit/libpciaccess/dist/config.sub
N xsrc/external/mit/libpciaccess/dist/meson_options.txt
U xsrc/external/mit/libpciaccess/dist/config.h.in
U xsrc/external/mit/libpciaccess/dist/README.md
U xsrc/external/mit/libpciaccess/dist/ChangeLog
U xsrc/external/mit/libpciaccess/dist/INSTALL
U xsrc/external/mit/libpciaccess/dist/configure.ac
U xsrc/external/mit/libpciaccess/dist/config.guess
U xsrc/external/mit/libpciaccess/dist/missing
U xsrc/external/mit/libpciaccess/dist/depcomp
N xsrc/external/mit/libpciaccess/dist/meson.build
U xsrc/external/mit/libpciaccess/dist/install-sh
U xsrc/external/mit/libpciaccess/dist/Makefile.in
U xsrc/external/mit/libpciaccess/dist/ltmain.sh
U xsrc/external/mit/libpciaccess/dist/aclocal.m4
U xsrc/external/mit/libpciaccess/dist/compile
U xsrc/external/mit/libpciaccess/dist/AUTHORS
U xsrc/external/mit/libpciaccess/dist/COPYING
U xsrc/external/mit/libpciaccess/dist/Makefile.am
C xsrc/external/mit/libpciaccess/dist/m4/libtool.m4
C xsrc/external/mit/libpciaccess/dist/m4/lt~obsolete.m4
C xsrc/external/mit/libpciaccess/dist/m4/ltoptions.m4
C xsrc/external/mit/libpciaccess/dist/m4/ltversion.m4
U xsrc/external/mit/libpciaccess/dist/m4/ax_define_dir.m4
C xsrc/external/mit/libpciaccess/dist/m4/ltsugar.m4
U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.am
U xsrc/external/mit/libpciaccess/dist/scanpci/scanpci.c
N xsrc/external/mit/libpciaccess/dist/scanpci/meson.build
U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.in
U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.c
U xsrc/external/mit/libpciaccess/dist/src/linux_sysfs.c
U xsrc/external/mit/libpciaccess/dist/src/openbsd_pci.c
U xsrc/external/mit/libpciaccess/dist/src/x86_pci.h
U xsrc/external/mit/libpciaccess/dist/src/Makefile.am
U xsrc/external/mit/libpciaccess/dist/src/pciaccess_private.h
U xsrc/external/mit/libpciaccess/dist/src/common_init.c
U xsrc/external/mit/libpciaccess/dist/src/common_bridge.c
U xsrc/external/mit/libpciaccess/dist/src/common_device_name.c
U xsrc/external/mit/libpciaccess/dist/src/common_iterator.c
U xsrc/external/mit/libpciaccess/dist/src/Makefile.in
U xsrc/external/mit/libpciaccess/dist/src/common_io.c
U xsrc/external/mit/libpciaccess/dist/src/common_capability.c
N xsrc/external/mit/libpciaccess/dist/src/meson.build
U xsrc/external/mit/libpciaccess/dist/src/pci_tools.h
U xsrc/external/mit/libpciaccess/dist/src/solx_devfs.c
C xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c
U xsrc/external/mit/libpciaccess/dist/src/x86_pci.c
U xsrc/external/mit/libpciaccess/dist/src/hurd_pci.c
U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.h
U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb_stub.c
U xsrc/external/mit/libpciaccess/dist/src/freebsd_pci.c
U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb.c
C xsrc/external/mit/libpciaccess/dist/src/common_interface.c
U xsrc/external/mit/libpciaccess/dist/src/common_map.c
U xsrc/external/mit/libpciaccess/dist/man/Makefile.in
U xsrc/external/mit/libpciaccess/dist/man/scanpci.man
N xsrc/external/mit/libpciaccess/dist/man/meson.build
U xsrc/external/mit/libpciaccess/dist/man/Makefile.am
U xsrc/external/mit/libpciaccess/dist/include/Makefile.in
U xsrc/external/mit/libpciaccess/dist/include/pciaccess.h
U xsrc/external/mit/libpciaccess/dist/include/Makefile.am

7 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libpciaccess/dist

CVS import: xsrc/external/mit/libpciaccess/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 01:44:50 UTC 2022

Update of /cvsroot/xsrc/external/mit/libpciaccess/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv4315

Log Message:
initial import of libpciaccess-0.17

Status:

Vendor Tag: xorg
Release Tags:   libpciaccess-0-17

U xsrc/external/mit/libpciaccess/dist/pciaccess.pc.in
U xsrc/external/mit/libpciaccess/dist/configure
U xsrc/external/mit/libpciaccess/dist/config.sub
N xsrc/external/mit/libpciaccess/dist/meson_options.txt
U xsrc/external/mit/libpciaccess/dist/config.h.in
U xsrc/external/mit/libpciaccess/dist/README.md
U xsrc/external/mit/libpciaccess/dist/ChangeLog
U xsrc/external/mit/libpciaccess/dist/INSTALL
U xsrc/external/mit/libpciaccess/dist/configure.ac
U xsrc/external/mit/libpciaccess/dist/config.guess
U xsrc/external/mit/libpciaccess/dist/missing
U xsrc/external/mit/libpciaccess/dist/depcomp
N xsrc/external/mit/libpciaccess/dist/meson.build
U xsrc/external/mit/libpciaccess/dist/install-sh
U xsrc/external/mit/libpciaccess/dist/Makefile.in
U xsrc/external/mit/libpciaccess/dist/ltmain.sh
U xsrc/external/mit/libpciaccess/dist/aclocal.m4
U xsrc/external/mit/libpciaccess/dist/compile
U xsrc/external/mit/libpciaccess/dist/AUTHORS
U xsrc/external/mit/libpciaccess/dist/COPYING
U xsrc/external/mit/libpciaccess/dist/Makefile.am
C xsrc/external/mit/libpciaccess/dist/m4/libtool.m4
C xsrc/external/mit/libpciaccess/dist/m4/lt~obsolete.m4
C xsrc/external/mit/libpciaccess/dist/m4/ltoptions.m4
C xsrc/external/mit/libpciaccess/dist/m4/ltversion.m4
U xsrc/external/mit/libpciaccess/dist/m4/ax_define_dir.m4
C xsrc/external/mit/libpciaccess/dist/m4/ltsugar.m4
U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.am
U xsrc/external/mit/libpciaccess/dist/scanpci/scanpci.c
N xsrc/external/mit/libpciaccess/dist/scanpci/meson.build
U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.in
U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.c
U xsrc/external/mit/libpciaccess/dist/src/linux_sysfs.c
U xsrc/external/mit/libpciaccess/dist/src/openbsd_pci.c
U xsrc/external/mit/libpciaccess/dist/src/x86_pci.h
U xsrc/external/mit/libpciaccess/dist/src/Makefile.am
U xsrc/external/mit/libpciaccess/dist/src/pciaccess_private.h
U xsrc/external/mit/libpciaccess/dist/src/common_init.c
U xsrc/external/mit/libpciaccess/dist/src/common_bridge.c
U xsrc/external/mit/libpciaccess/dist/src/common_device_name.c
U xsrc/external/mit/libpciaccess/dist/src/common_iterator.c
U xsrc/external/mit/libpciaccess/dist/src/Makefile.in
U xsrc/external/mit/libpciaccess/dist/src/common_io.c
U xsrc/external/mit/libpciaccess/dist/src/common_capability.c
N xsrc/external/mit/libpciaccess/dist/src/meson.build
U xsrc/external/mit/libpciaccess/dist/src/pci_tools.h
U xsrc/external/mit/libpciaccess/dist/src/solx_devfs.c
C xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c
U xsrc/external/mit/libpciaccess/dist/src/x86_pci.c
U xsrc/external/mit/libpciaccess/dist/src/hurd_pci.c
U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.h
U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb_stub.c
U xsrc/external/mit/libpciaccess/dist/src/freebsd_pci.c
U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb.c
C xsrc/external/mit/libpciaccess/dist/src/common_interface.c
U xsrc/external/mit/libpciaccess/dist/src/common_map.c
U xsrc/external/mit/libpciaccess/dist/man/Makefile.in
U xsrc/external/mit/libpciaccess/dist/man/scanpci.man
N xsrc/external/mit/libpciaccess/dist/man/meson.build
U xsrc/external/mit/libpciaccess/dist/man/Makefile.am
U xsrc/external/mit/libpciaccess/dist/include/Makefile.in
U xsrc/external/mit/libpciaccess/dist/include/pciaccess.h
U xsrc/external/mit/libpciaccess/dist/include/Makefile.am

7 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libpciaccess/dist

CVS commit: xsrc/external/mit/libpciaccess/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 01:45:26 UTC 2022

Modified Files:
xsrc/external/mit/libpciaccess/dist/m4: libtool.m4 ltoptions.m4
ltsugar.m4 ltversion.m4 lt~obsolete.m4
xsrc/external/mit/libpciaccess/dist/src: common_interface.c
netbsd_pci.c

Log Message:
merge libpciaccess 0.17.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libpciaccess/dist/m4/libtool.m4
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libpciaccess/dist/m4/ltoptions.m4 \
xsrc/external/mit/libpciaccess/dist/m4/ltsugar.m4 \
xsrc/external/mit/libpciaccess/dist/m4/ltversion.m4 \
xsrc/external/mit/libpciaccess/dist/m4/lt~obsolete.m4
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/libpciaccess/dist/src/common_interface.c
cvs rdiff -u -r1.21 -r1.22 \
xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/libpciaccess/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 01:45:26 UTC 2022

Modified Files:
xsrc/external/mit/libpciaccess/dist/m4: libtool.m4 ltoptions.m4
ltsugar.m4 ltversion.m4 lt~obsolete.m4
xsrc/external/mit/libpciaccess/dist/src: common_interface.c
netbsd_pci.c

Log Message:
merge libpciaccess 0.17.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libpciaccess/dist/m4/libtool.m4
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libpciaccess/dist/m4/ltoptions.m4 \
xsrc/external/mit/libpciaccess/dist/m4/ltsugar.m4 \
xsrc/external/mit/libpciaccess/dist/m4/ltversion.m4 \
xsrc/external/mit/libpciaccess/dist/m4/lt~obsolete.m4
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/libpciaccess/dist/src/common_interface.c
cvs rdiff -u -r1.21 -r1.22 \
xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libpciaccess/dist/m4/libtool.m4
diff -u xsrc/external/mit/libpciaccess/dist/m4/libtool.m4:1.6 xsrc/external/mit/libpciaccess/dist/m4/libtool.m4:1.7
--- xsrc/external/mit/libpciaccess/dist/m4/libtool.m4:1.6	Sun Mar 11 10:37:32 2018
+++ xsrc/external/mit/libpciaccess/dist/m4/libtool.m4	Sat Nov 12 01:45:25 2022
@@ -1,6 +1,7 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
-#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
+#   Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software
+#   Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -31,7 +32,7 @@ m4_define([_LT_COPYING], [dnl
 # along with this program.  If not, see .
 ])
 
-# serial 58 LT_INIT
+# serial 59 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -181,6 +182,7 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
 m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
 m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_DECL_FILECMD])dnl
 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
 m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
@@ -219,8 +221,8 @@ esac
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a '.a' archive for static linking (except MSVC,
-# which needs '.lib').
+# All known linkers require a '.a' archive for static linking (except MSVC and
+# ICC, which need '.lib').
 libext=a
 
 with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -778,7 +780,7 @@ _LT_EOF
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
+  $SED '$q' "$ltmain" >> "$cfgfile" \
  || (rm -f "$cfgfile"; exit 1)
 
mv -f "$cfgfile" "$ofile" ||
@@ -1042,8 +1044,8 @@ int forced_loaded() { return 2;}
 _LT_EOF
   echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
   $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-  echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-  $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+  echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+  $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
   echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
   $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
   cat > conftest.c << _LT_EOF
@@ -1067,17 +1069,12 @@ _LT_EOF
   _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
 darwin1.*)
   _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-darwin*) # darwin 5.x on
-  # if running on 10.5 or later, the deployment target defaults
-  # to the OS version, if on x86, and 10.4, the deployment
-  # target defaults to 10.4. Don't you love it?
-  case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-	10.[[012]][[,.]]*)
-	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+darwin*)
+  case $MACOSX_DEPLOYMENT_TARGET,$host in
+10.[[012]],*|,*powerpc*-darwin[[5-8]]*)
+  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+*)
+  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
   esac
 ;;
   esac
@@ -1126,12 +1123,12 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
 output_verbose_link_cmd=func_echo_all
 _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
 _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undef

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sat Nov 12 02:03:09 UTC 2022

Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/libpciaccess: Makefile shlib_version

Log Message:
updates for libpciaccess 0.17.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libpciaccess/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libpciaccess/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.99 src/distrib/sets/lists/xbase/shl.mi:1.100
--- src/distrib/sets/lists/xbase/shl.mi:1.99	Thu Jul 14 07:41:49 2022
+++ src/distrib/sets/lists/xbase/shl.mi	Sat Nov 12 02:03:08 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.99 2022/07/14 07:41:49 mrg Exp $
+# $NetBSD: shl.mi,v 1.100 2022/11/12 02:03:08 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -199,7 +199,7 @@
 ./usr/X11R7/lib/liblbxutil.so.2.0		xbase-obsolete		obsolete
 ./usr/X11R7/lib/libpciaccess.so			xbase-libpciaccess-lib		xorg,compatx11file
 ./usr/X11R7/lib/libpciaccess.so.0		xbase-libpciaccess-lib		xorg,compatx11file
-./usr/X11R7/lib/libpciaccess.so.0.3		xbase-libpciaccess-lib		xorg,compatx11file
+./usr/X11R7/lib/libpciaccess.so.0.4		xbase-libpciaccess-lib		xorg,compatx11file
 ./usr/X11R7/lib/libpixman-1.so			xbase-pixman-lib		xorg,compatx11file
 ./usr/X11R7/lib/libpixman-1.so.2		xbase-pixman-lib		xorg,compatx11file
 ./usr/X11R7/lib/libpixman-1.so.2.2		xbase-pixman-lib		xorg,compatx11file

Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.65 src/distrib/sets/lists/xdebug/shl.mi:1.66
--- src/distrib/sets/lists/xdebug/shl.mi:1.65	Thu Jul 14 07:41:49 2022
+++ src/distrib/sets/lists/xdebug/shl.mi	Sat Nov 12 02:03:08 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.65 2022/07/14 07:41:49 mrg Exp $
+# $NetBSD: shl.mi,v 1.66 2022/11/12 02:03:08 mrg Exp $
 ./usr/libdata/debug/usr/X11R7/lib	base-sys-usr		xorg,debug,compatx11dir
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug	obsolete		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug	obsolete		obsolete
@@ -66,7 +66,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/libgbm.so.1.0.debug	xdebug-libgbm-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libglapi.so.1.0.debug	xdebug-libglapi-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug	xdebug-obsolete			xorg,obsolete,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.3.debug	xdebug-libpciaccess-debug		xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.4.debug	xdebug-libpciaccess-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.2.debug	xdebug-pixman-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-atom.so.1.0.debug	xdebug-xcb-util-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-aux.so.0.0.debug	xdebug-xcb-util-debug		xorg,debug,compatx11file

Index: src/external/mit/xorg/lib/libpciaccess/Makefile
diff -u src/external/mit/xorg/lib/libpciaccess/Makefile:1.10 src/external/mit/xorg/lib/libpciaccess/Makefile:1.11
--- src/external/mit/xorg/lib/libpciaccess/Makefile:1.10	Fri Jan 14 19:44:04 2022
+++ src/external/mit/xorg/lib/libpciaccess/Makefile	Sat Nov 12 02:03:08 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2022/01/14 19:44:04 macallan Exp $
+#	$NetBSD: Makefile,v 1.11 2022/11/12 02:03:08 mrg Exp $
 
 .include 
 
@@ -27,6 +27,8 @@ INCS=	pciaccess.h
 INCSDIR=${X11INCDIR}
 
 PKGDIST=	${LIB}
+PKGCONFIG_SED_FLAGS= \
+	-e "s,@PCIACCESS_LIBS@,-lpci -lz," \
 
 LIBDPLIBS+=	pci	${NETBSDSRCDIR}/lib/libpci \
 		z	${NETBSDSRCDIR}/lib/libz

Index: src/external/mit/xorg/lib/libpciaccess/shlib_version
diff -u src/external/mit/xorg/lib/libpciaccess/shlib_version:1.4 src/external/mit/xorg/lib/libpciaccess/shlib_version:1.5
--- src/external/mit/xorg/lib/libpciaccess/shlib_version:1.4	Sat Jun  1 09:08:01 2013
+++ src/external/mit/xorg/lib/libpciaccess/shlib_version	Sat Nov 12 02:03:08 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.4 2013/06/01 09:08:01 mrg Exp $
+#	$NetBSD: shlib_version,v 1.5 2022/11/12 02:03:08 mrg Exp $
 #
 major=0
-minor=3
+minor=4

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sat Nov 12 02:03:09 UTC 2022

Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/libpciaccess: Makefile shlib_version

Log Message:
updates for libpciaccess 0.17.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libpciaccess/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libpciaccess/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS import: xsrc/external/mit/libdrm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 02:04:43 UTC 2022

Update of /cvsroot/xsrc/external/mit/libdrm/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv12175

Log Message:
initial import of libdrm-2.4.114

Status:

Vendor Tag: xorg
Release Tags:   libdrm-2-4-114

U xsrc/external/mit/libdrm/dist/.editorconfig
U xsrc/external/mit/libdrm/dist/.gitlab-ci.yml
U xsrc/external/mit/libdrm/dist/Android.common.mk
U xsrc/external/mit/libdrm/dist/Android.mk
U xsrc/external/mit/libdrm/dist/CONTRIBUTING.rst
U xsrc/external/mit/libdrm/dist/CleanSpec.mk
U xsrc/external/mit/libdrm/dist/Makefile.sources
U xsrc/external/mit/libdrm/dist/README.rst
U xsrc/external/mit/libdrm/dist/RELEASING
U xsrc/external/mit/libdrm/dist/core-symbols.txt
U xsrc/external/mit/libdrm/dist/gen_table_fourcc.py
U xsrc/external/mit/libdrm/dist/libdrm.pc.in
U xsrc/external/mit/libdrm/dist/libdrm_lists.h
U xsrc/external/mit/libdrm/dist/libdrm_macros.h
U xsrc/external/mit/libdrm/dist/libsync.h
U xsrc/external/mit/libdrm/dist/meson.build
U xsrc/external/mit/libdrm/dist/meson_options.txt
U xsrc/external/mit/libdrm/dist/symbols-check.py
U xsrc/external/mit/libdrm/dist/util_double_list.h
U xsrc/external/mit/libdrm/dist/util_math.h
C xsrc/external/mit/libdrm/dist/xf86atomic.h
C xsrc/external/mit/libdrm/dist/xf86drm.c
C xsrc/external/mit/libdrm/dist/xf86drm.h
U xsrc/external/mit/libdrm/dist/xf86drmHash.c
U xsrc/external/mit/libdrm/dist/xf86drmHash.h
C xsrc/external/mit/libdrm/dist/xf86drmMode.c
C xsrc/external/mit/libdrm/dist/xf86drmMode.h
U xsrc/external/mit/libdrm/dist/xf86drmRandom.c
U xsrc/external/mit/libdrm/dist/xf86drmRandom.h
U xsrc/external/mit/libdrm/dist/xf86drmSL.c
U xsrc/external/mit/libdrm/dist/amdgpu/.editorconfig
U xsrc/external/mit/libdrm/dist/amdgpu/Android.mk
U xsrc/external/mit/libdrm/dist/amdgpu/Makefile.sources
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu-symbols.txt
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_asic_id.c
C xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_cs.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_device.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_gpu_info.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_internal.h
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vm.c
U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.c
U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.h
U xsrc/external/mit/libdrm/dist/amdgpu/libdrm_amdgpu.pc.in
U xsrc/external/mit/libdrm/dist/amdgpu/meson.build
U xsrc/external/mit/libdrm/dist/android/gralloc_handle.h
U xsrc/external/mit/libdrm/dist/data/Android.mk
U xsrc/external/mit/libdrm/dist/data/amdgpu.ids
U xsrc/external/mit/libdrm/dist/data/meson.build
U xsrc/external/mit/libdrm/dist/etnaviv/Android.mk
U xsrc/external/mit/libdrm/dist/etnaviv/Makefile.sources
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv-symbols.txt
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_bo.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_bo_cache.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_cmd_stream.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_device.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_drm.h
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_drmif.h
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_gpu.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_perfmon.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_pipe.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_priv.h
U xsrc/external/mit/libdrm/dist/etnaviv/libdrm_etnaviv.pc.in
U xsrc/external/mit/libdrm/dist/etnaviv/meson.build
U xsrc/external/mit/libdrm/dist/exynos/exynos-symbols.txt
U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.c
U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.h
U xsrc/external/mit/libdrm/dist/exynos/exynos_drmif.h
U xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.c
U xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.h
U xsrc/external/mit/libdrm/dist/exynos/fimg2d_reg.h
U xsrc/external/mit/libdrm/dist/exynos/libdrm_exynos.pc.in
U xsrc/external/mit/libdrm/dist/exynos/meson.build
U xsrc/external/mit/libdrm/dist/freedreno/Android.mk
U xsrc/external/mit/libdrm/dist/freedreno/Makefile.sources
U xsrc/external/mit/libdrm/dist/freedreno/freedreno-symbols.txt
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo.c
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo_cache.c
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_device.c
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_drmif.h
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_pipe.c
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_priv.h
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.c
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.h
U xsrc/external/mit/libdrm/dist/freedreno/libdrm_freedreno.pc.in
U xsrc/external/mit/libdrm/dist/freedreno/meson.build
U xsrc/external/mit/libdrm/dist/freedreno/kgsl/README
U xsrc/exter

CVS import: xsrc/external/mit/libdrm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 02:04:43 UTC 2022

Update of /cvsroot/xsrc/external/mit/libdrm/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv12175

Log Message:
initial import of libdrm-2.4.114

Status:

Vendor Tag: xorg
Release Tags:   libdrm-2-4-114

U xsrc/external/mit/libdrm/dist/.editorconfig
U xsrc/external/mit/libdrm/dist/.gitlab-ci.yml
U xsrc/external/mit/libdrm/dist/Android.common.mk
U xsrc/external/mit/libdrm/dist/Android.mk
U xsrc/external/mit/libdrm/dist/CONTRIBUTING.rst
U xsrc/external/mit/libdrm/dist/CleanSpec.mk
U xsrc/external/mit/libdrm/dist/Makefile.sources
U xsrc/external/mit/libdrm/dist/README.rst
U xsrc/external/mit/libdrm/dist/RELEASING
U xsrc/external/mit/libdrm/dist/core-symbols.txt
U xsrc/external/mit/libdrm/dist/gen_table_fourcc.py
U xsrc/external/mit/libdrm/dist/libdrm.pc.in
U xsrc/external/mit/libdrm/dist/libdrm_lists.h
U xsrc/external/mit/libdrm/dist/libdrm_macros.h
U xsrc/external/mit/libdrm/dist/libsync.h
U xsrc/external/mit/libdrm/dist/meson.build
U xsrc/external/mit/libdrm/dist/meson_options.txt
U xsrc/external/mit/libdrm/dist/symbols-check.py
U xsrc/external/mit/libdrm/dist/util_double_list.h
U xsrc/external/mit/libdrm/dist/util_math.h
C xsrc/external/mit/libdrm/dist/xf86atomic.h
C xsrc/external/mit/libdrm/dist/xf86drm.c
C xsrc/external/mit/libdrm/dist/xf86drm.h
U xsrc/external/mit/libdrm/dist/xf86drmHash.c
U xsrc/external/mit/libdrm/dist/xf86drmHash.h
C xsrc/external/mit/libdrm/dist/xf86drmMode.c
C xsrc/external/mit/libdrm/dist/xf86drmMode.h
U xsrc/external/mit/libdrm/dist/xf86drmRandom.c
U xsrc/external/mit/libdrm/dist/xf86drmRandom.h
U xsrc/external/mit/libdrm/dist/xf86drmSL.c
U xsrc/external/mit/libdrm/dist/amdgpu/.editorconfig
U xsrc/external/mit/libdrm/dist/amdgpu/Android.mk
U xsrc/external/mit/libdrm/dist/amdgpu/Makefile.sources
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu-symbols.txt
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_asic_id.c
C xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_cs.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_device.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_gpu_info.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_internal.h
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vm.c
U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.c
U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.h
U xsrc/external/mit/libdrm/dist/amdgpu/libdrm_amdgpu.pc.in
U xsrc/external/mit/libdrm/dist/amdgpu/meson.build
U xsrc/external/mit/libdrm/dist/android/gralloc_handle.h
U xsrc/external/mit/libdrm/dist/data/Android.mk
U xsrc/external/mit/libdrm/dist/data/amdgpu.ids
U xsrc/external/mit/libdrm/dist/data/meson.build
U xsrc/external/mit/libdrm/dist/etnaviv/Android.mk
U xsrc/external/mit/libdrm/dist/etnaviv/Makefile.sources
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv-symbols.txt
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_bo.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_bo_cache.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_cmd_stream.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_device.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_drm.h
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_drmif.h
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_gpu.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_perfmon.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_pipe.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_priv.h
U xsrc/external/mit/libdrm/dist/etnaviv/libdrm_etnaviv.pc.in
U xsrc/external/mit/libdrm/dist/etnaviv/meson.build
U xsrc/external/mit/libdrm/dist/exynos/exynos-symbols.txt
U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.c
U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.h
U xsrc/external/mit/libdrm/dist/exynos/exynos_drmif.h
U xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.c
U xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.h
U xsrc/external/mit/libdrm/dist/exynos/fimg2d_reg.h
U xsrc/external/mit/libdrm/dist/exynos/libdrm_exynos.pc.in
U xsrc/external/mit/libdrm/dist/exynos/meson.build
U xsrc/external/mit/libdrm/dist/freedreno/Android.mk
U xsrc/external/mit/libdrm/dist/freedreno/Makefile.sources
U xsrc/external/mit/libdrm/dist/freedreno/freedreno-symbols.txt
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo.c
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo_cache.c
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_device.c
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_drmif.h
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_pipe.c
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_priv.h
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.c
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.h
U xsrc/external/mit/libdrm/dist/freedreno/libdrm_freedreno.pc.in
U xsrc/external/mit/libdrm/dist/freedreno/meson.build
U xsrc/external/mit/libdrm/dist/freedreno/kgsl/README
U xsrc/exter

CVS commit: xsrc/external/mit/libdrm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 02:07:08 UTC 2022

Modified Files:
xsrc/external/mit/libdrm/dist: xf86atomic.h xf86drm.c xf86drm.h
xf86drmMode.c xf86drmMode.h
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu_bo.c
xsrc/external/mit/libdrm/dist/include/drm: i915_drm.h
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
Removed Files:
xsrc/external/mit/libdrm/dist/.gitlab-ci: debian-install.sh

Log Message:
merge libdrm 2.4.114.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/libdrm/dist/xf86atomic.h
cvs rdiff -u -r1.31 -r1.32 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/libdrm/dist/xf86drm.h
cvs rdiff -u -r1.20 -r1.21 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/libdrm/dist/xf86drmMode.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/.gitlab-ci/debian-install.sh
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h
cvs rdiff -u -r1.21 -r1.22 \
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
cvs rdiff -u -r1.18 -r1.19 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/libdrm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 02:07:08 UTC 2022

Modified Files:
xsrc/external/mit/libdrm/dist: xf86atomic.h xf86drm.c xf86drm.h
xf86drmMode.c xf86drmMode.h
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu_bo.c
xsrc/external/mit/libdrm/dist/include/drm: i915_drm.h
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
Removed Files:
xsrc/external/mit/libdrm/dist/.gitlab-ci: debian-install.sh

Log Message:
merge libdrm 2.4.114.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/libdrm/dist/xf86atomic.h
cvs rdiff -u -r1.31 -r1.32 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/libdrm/dist/xf86drm.h
cvs rdiff -u -r1.20 -r1.21 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/libdrm/dist/xf86drmMode.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/.gitlab-ci/debian-install.sh
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h
cvs rdiff -u -r1.21 -r1.22 \
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
cvs rdiff -u -r1.18 -r1.19 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libdrm/dist/xf86atomic.h
diff -u xsrc/external/mit/libdrm/dist/xf86atomic.h:1.14 xsrc/external/mit/libdrm/dist/xf86atomic.h:1.15
--- xsrc/external/mit/libdrm/dist/xf86atomic.h:1.14	Sun Nov  1 09:57:37 2020
+++ xsrc/external/mit/libdrm/dist/xf86atomic.h	Sat Nov 12 02:07:07 2022
@@ -108,7 +108,7 @@ static inline int atomic_add_unless(atom
 	c = atomic_read(v);
 	while (c != unless && (old = atomic_cmpxchg(v, c, c + add)) != c)
 		c = old;
-	return c == unless;
+	return c != unless;
 }
 
 #endif

Index: xsrc/external/mit/libdrm/dist/xf86drm.c
diff -u xsrc/external/mit/libdrm/dist/xf86drm.c:1.31 xsrc/external/mit/libdrm/dist/xf86drm.c:1.32
--- xsrc/external/mit/libdrm/dist/xf86drm.c:1.31	Mon Jul 11 19:26:44 2022
+++ xsrc/external/mit/libdrm/dist/xf86drm.c	Sat Nov 12 02:07:07 2022
@@ -853,7 +853,7 @@ wait_for_udev:
 }
 #endif
 
-fd = open(buf, O_RDWR | O_CLOEXEC, 0);
+fd = open(buf, O_RDWR | O_CLOEXEC);
 drmMsg("drmOpenDevice: open result is %d, (%s)\n",
fd, fd < 0 ? strerror(errno) : "OK");
 if (fd >= 0)
@@ -873,7 +873,7 @@ wait_for_udev:
 chmod(buf, devmode);
 }
 }
-fd = open(buf, O_RDWR | O_CLOEXEC, 0);
+fd = open(buf, O_RDWR | O_CLOEXEC);
 drmMsg("drmOpenDevice: open result is %d, (%s)\n",
fd, fd < 0 ? strerror(errno) : "OK");
 if (fd >= 0)
@@ -911,7 +911,7 @@ static int drmOpenMinor(int minor, int c
 return -EINVAL;
 
 sprintf(buf, dev_name, DRM_DIR_NAME, minor);
-if ((fd = open(buf, O_RDWR | O_CLOEXEC, 0)) >= 0)
+if ((fd = open(buf, O_RDWR | O_CLOEXEC)) >= 0)
 return fd;
 return -errno;
 }
@@ -1139,7 +1139,7 @@ static int drmOpenByName(const char *nam
 int  retcode;
 
 sprintf(proc_name, "/proc/dri/%d/name", i);
-if ((fd = open(proc_name, O_RDONLY, 0)) >= 0) {
+if ((fd = open(proc_name, O_RDONLY)) >= 0) {
 retcode = read(fd, buf, sizeof(buf)-1);
 close(fd);
 if (retcode) {
@@ -4063,7 +4063,7 @@ out:
 if (get_sysctl_pci_bus_info(maj, min, &info) != 0)
 return -EINVAL;
 
-fd = open("/dev/pci", O_RDONLY, 0);
+fd = open("/dev/pci", O_RDONLY);
 if (fd < 0)
 return -errno;
 
@@ -5277,3 +5277,43 @@ drmGetFormatModifierName(uint64_t modifi
 
 return modifier_found;
 }
+
+/**
+ * Get a human-readable name for a DRM FourCC format.
+ *
+ * \param format The format.
+ * \return A malloc'ed string containing the format name. Caller is responsible
+ * for freeing it.
+ */
+drm_public char *
+drmGetFormatName(uint32_t format)
+{
+char *str, code[5];
+const char *be;
+size_t str_size, i;
+
+be = (format & DRM_FORMAT_BIG_ENDIAN) ? "_BE" : "";
+format &= ~DRM_FORMAT_BIG_ENDIAN;
+
+if (format == DRM_FORMAT_INVALID)
+return strdup("INVALID");
+
+code[0] = (char) ((format >> 0) & 0xFF);
+code[1] = (char) ((format >> 8) & 0xFF);
+code[2] = (char) ((format >> 16) & 0xFF);
+code[3] = (char) ((format >> 24) & 0xFF);
+code[4] = '\0';
+
+/* Trim spaces at the end */
+for (i = 3; i > 0 && code[i] == ' '; i--)
+code[i] = '\0';
+
+str_size = strlen(code) + strlen(be) + 1;
+str = malloc(str_size);
+if (!str)
+return NULL;
+
+snprintf(str, str_size, "%s%s", code, be);
+
+return str;
+}

Index: xsrc/external/mit/libdrm/dist/xf86drm.h
diff -u xsrc/external/mit/libdrm/dist/xf86drm.h:1.15 xsrc/external/mit/libdrm/dist/

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sat Nov 12 02:20:16 UTC 2022

Modified Files:
src: UPDATING
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/libdrm: shlib_version
src/usr.bin/kdump: Makefile.ioctl-c

Log Message:
updates for libdrm 2.4.114.

unfortunately, the i915 ioctls are no longer handled by kdump/ktruss
as the new one conflicts with base.  this needs a clean build in these
dirs (and rescue).  the radeon ioctls have been enabled instead.


To generate a diff of this commit:
cvs rdiff -u -r1.333 -r1.334 src/UPDATING
cvs rdiff -u -r1.100 -r1.101 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libdrm/shlib_version
cvs rdiff -u -r1.38 -r1.39 src/usr.bin/kdump/Makefile.ioctl-c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sat Nov 12 02:20:16 UTC 2022

Modified Files:
src: UPDATING
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/libdrm: shlib_version
src/usr.bin/kdump: Makefile.ioctl-c

Log Message:
updates for libdrm 2.4.114.

unfortunately, the i915 ioctls are no longer handled by kdump/ktruss
as the new one conflicts with base.  this needs a clean build in these
dirs (and rescue).  the radeon ioctls have been enabled instead.


To generate a diff of this commit:
cvs rdiff -u -r1.333 -r1.334 src/UPDATING
cvs rdiff -u -r1.100 -r1.101 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libdrm/shlib_version
cvs rdiff -u -r1.38 -r1.39 src/usr.bin/kdump/Makefile.ioctl-c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/UPDATING
diff -u src/UPDATING:1.333 src/UPDATING:1.334
--- src/UPDATING:1.333	Sat Oct  8 08:21:56 2022
+++ src/UPDATING	Sat Nov 12 02:20:15 2022
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.333 2022/10/08 08:21:56 riastradh Exp $
+$NetBSD: UPDATING,v 1.334 2022/11/12 02:20:15 mrg Exp $
 
 This file (UPDATING) is intended to be a brief reference to recent
 changes that might cause problems in the build process, and a guide for
@@ -19,6 +19,17 @@ See also: BUILDING, build.sh, Makefile.
 Recent changes:
 ^^^
 
+2022:
+	The new libdrm import worsened the conflict issues for the
+	kdump/ktruss ioctl, and i915 now conflicts with base, and has
+	been turned off.  This will cause update build issues like:
+
+		kdump-ioctl.c:12175:143: error: 'DRM_IOCTL_I915_DESTROY_HEAP'
+		   undeclared here (not in a function);
+		   did you mean 'DRM_IOCTL_MODE_DESTROY_DUMB'?
+
+	You'll need to clean usr.bin/ktruss, usr.bin/kdump, and rescue.
+
 20220921:
 	Since the kernel version was bumped to 9.99.100, the bootloader
 	must be updated on x86 or EFI boot platforms in order to load

Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.100 src/distrib/sets/lists/xbase/shl.mi:1.101
--- src/distrib/sets/lists/xbase/shl.mi:1.100	Sat Nov 12 02:03:08 2022
+++ src/distrib/sets/lists/xbase/shl.mi	Sat Nov 12 02:20:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.100 2022/11/12 02:03:08 mrg Exp $
+# $NetBSD: shl.mi,v 1.101 2022/11/12 02:20:15 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -166,7 +166,7 @@
 ./usr/X11R7/lib/libXxf86vm.so.2.0		xbase-libXxf86vm-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm.so			xbase-libdrm-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm.so.3			xbase-libdrm-lib		xorg,compatx11file
-./usr/X11R7/lib/libdrm.so.3.6			xbase-libdrm-lib		xorg,compatx11file
+./usr/X11R7/lib/libdrm.so.3.7			xbase-libdrm-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm_radeon.so		xbase-libdrm_radeon-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm_radeon.so.0		xbase-libdrm_radeon-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm_radeon.so.0.0		xbase-libdrm_radeon-lib		xorg,compatx11file

Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.66 src/distrib/sets/lists/xdebug/shl.mi:1.67
--- src/distrib/sets/lists/xdebug/shl.mi:1.66	Sat Nov 12 02:03:08 2022
+++ src/distrib/sets/lists/xdebug/shl.mi	Sat Nov 12 02:20:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.66 2022/11/12 02:03:08 mrg Exp $
+# $NetBSD: shl.mi,v 1.67 2022/11/12 02:20:15 mrg Exp $
 ./usr/libdata/debug/usr/X11R7/lib	base-sys-usr		xorg,debug,compatx11dir
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug	obsolete		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug	obsolete		obsolete
@@ -56,7 +56,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/libXxf86dga.so.2.0.debug	xdebug-libXxf86dga-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXxf86misc.so.2.0.debug	xdebug-libXxf86misc-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXxf86vm.so.2.0.debug	xdebug-libXxf86vm-debug		xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.6.debug	xdebug-libdrm-debug		xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.7.debug	xdebug-libdrm-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.0.debug	xdebug-libdrm_radeon-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libepoxy.so.0.1.debug	xdebug-libepoxy-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug	xdebug-obsolete		xorg,obsolete,compatx11file

Index: src/external/mit/xorg/lib/libdrm/shlib_version
diff -u src/external/mit/xorg/lib/libdrm/shlib_version:1.8 src/external/mit/xorg/lib/libdrm/shlib_version:1.9
--- src/extern

CVS import: xsrc/external/mit/pixman/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 03:24:12 UTC 2022

Update of /cvsroot/xsrc/external/mit/pixman/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv25726

Log Message:
initial import of pixman-0.42.2

Status:

Vendor Tag: xorg
Release Tags:   pixman-0-42-2

U xsrc/external/mit/pixman/dist/depcomp
U xsrc/external/mit/pixman/dist/meson_options.txt
U xsrc/external/mit/pixman/dist/missing
U xsrc/external/mit/pixman/dist/configure
U xsrc/external/mit/pixman/dist/test-driver
U xsrc/external/mit/pixman/dist/Makefile.am
U xsrc/external/mit/pixman/dist/install-sh
U xsrc/external/mit/pixman/dist/Makefile.win32.common
U xsrc/external/mit/pixman/dist/arm-simd-test.S
U xsrc/external/mit/pixman/dist/aclocal.m4
U xsrc/external/mit/pixman/dist/pixman-1.pc.in
U xsrc/external/mit/pixman/dist/ChangeLog
U xsrc/external/mit/pixman/dist/meson.build
U xsrc/external/mit/pixman/dist/AUTHORS
U xsrc/external/mit/pixman/dist/NEWS
U xsrc/external/mit/pixman/dist/compile
U xsrc/external/mit/pixman/dist/config.guess
U xsrc/external/mit/pixman/dist/COPYING
U xsrc/external/mit/pixman/dist/Makefile.in
U xsrc/external/mit/pixman/dist/Makefile.win32
U xsrc/external/mit/pixman/dist/configure.ac
U xsrc/external/mit/pixman/dist/config.sub
U xsrc/external/mit/pixman/dist/ltmain.sh
U xsrc/external/mit/pixman/dist/INSTALL
U xsrc/external/mit/pixman/dist/config.h.in
N xsrc/external/mit/pixman/dist/a64-neon-test.S
U xsrc/external/mit/pixman/dist/README
U xsrc/external/mit/pixman/dist/pixman-1-uninstalled.pc.in
U xsrc/external/mit/pixman/dist/neon-test.S
U xsrc/external/mit/pixman/dist/test/infinite-loop.c
U xsrc/external/mit/pixman/dist/test/radial-perf-test.c
U xsrc/external/mit/pixman/dist/test/cover-test.c
U xsrc/external/mit/pixman/dist/test/stress-test.c
U xsrc/external/mit/pixman/dist/test/utils.c
U xsrc/external/mit/pixman/dist/test/region-test.c
U xsrc/external/mit/pixman/dist/test/prng-test.c
U xsrc/external/mit/pixman/dist/test/alphamap.c
U xsrc/external/mit/pixman/dist/test/fetch-test.c
U xsrc/external/mit/pixman/dist/test/lowlevel-blt-bench.c
U xsrc/external/mit/pixman/dist/test/region-translate-test.c
U xsrc/external/mit/pixman/dist/test/utils-prng.h
U xsrc/external/mit/pixman/dist/test/blitters-test.c
U xsrc/external/mit/pixman/dist/test/pixel-test.c
U xsrc/external/mit/pixman/dist/test/scaling-crash-test.c
U xsrc/external/mit/pixman/dist/test/matrix-test.c
U xsrc/external/mit/pixman/dist/test/tolerance-test.c
U xsrc/external/mit/pixman/dist/test/trap-crasher.c
U xsrc/external/mit/pixman/dist/test/filter-reduction-test.c
U xsrc/external/mit/pixman/dist/test/utils.h
U xsrc/external/mit/pixman/dist/test/scaling-helpers-test.c
U xsrc/external/mit/pixman/dist/test/Makefile.in
U xsrc/external/mit/pixman/dist/test/affine-test.c
U xsrc/external/mit/pixman/dist/test/meson.build
U xsrc/external/mit/pixman/dist/test/radial-invalid.c
U xsrc/external/mit/pixman/dist/test/thread-test.c
U xsrc/external/mit/pixman/dist/test/affine-bench.c
U xsrc/external/mit/pixman/dist/test/gradient-crash-test.c
U xsrc/external/mit/pixman/dist/test/combiner-test.c
U xsrc/external/mit/pixman/dist/test/rotate-test.c
U xsrc/external/mit/pixman/dist/test/scaling-bench.c
U xsrc/external/mit/pixman/dist/test/alpha-loop.c
U xsrc/external/mit/pixman/dist/test/pdf-op-test.c
U xsrc/external/mit/pixman/dist/test/Makefile.am
U xsrc/external/mit/pixman/dist/test/composite.c
U xsrc/external/mit/pixman/dist/test/region-contains-test.c
U xsrc/external/mit/pixman/dist/test/oob-test.c
U xsrc/external/mit/pixman/dist/test/check-formats.c
U xsrc/external/mit/pixman/dist/test/composite-traps-test.c
U xsrc/external/mit/pixman/dist/test/utils-prng.c
U xsrc/external/mit/pixman/dist/test/fence-image-self-test.c
U xsrc/external/mit/pixman/dist/test/solid-test.c
U xsrc/external/mit/pixman/dist/test/glyph-test.c
U xsrc/external/mit/pixman/dist/test/Makefile.sources
U xsrc/external/mit/pixman/dist/test/a1-trap-test.c
U xsrc/external/mit/pixman/dist/test/scaling-test.c
U xsrc/external/mit/pixman/dist/pixman/pixman-mips-dspr2.h
U xsrc/external/mit/pixman/dist/pixman/pixman-noop.c
U xsrc/external/mit/pixman/dist/pixman/loongson-mmintrin.h
U xsrc/external/mit/pixman/dist/pixman/pixman-edge-accessors.c
C xsrc/external/mit/pixman/dist/pixman/pixman-ppc.c
U xsrc/external/mit/pixman/dist/pixman/pixman-accessor.h
U xsrc/external/mit/pixman/dist/pixman/pixman-conical-gradient.c
N xsrc/external/mit/pixman/dist/pixman/pixman-arma64-neon-asm.h
U xsrc/external/mit/pixman/dist/pixman/pixman-glyph.c
N xsrc/external/mit/pixman/dist/pixman/pixman-arma64-neon-asm-bilinear.S
U xsrc/external/mit/pixman/dist/pixman/pixman-mips-dspr2-asm.h
N xsrc/external/mit/pixman/dist/pixman/pixman-arma64-neon-asm.S
C xsrc/external/mit/pixman/dist/pixman/pixman-arm.c
U xsrc/external/mit/pixman/dist/pixman/Makefile.win32
U xsrc/external/mit/pixman/dist/pixman/pixman-mips-dspr2-asm.S
U xsrc/external/mit/pixman/dist/pixman/pixman-utils.c
U xsrc/external/mit/pixman/dist/pixman/pixma

CVS import: xsrc/external/mit/pixman/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 03:24:12 UTC 2022

Update of /cvsroot/xsrc/external/mit/pixman/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv25726

Log Message:
initial import of pixman-0.42.2

Status:

Vendor Tag: xorg
Release Tags:   pixman-0-42-2

U xsrc/external/mit/pixman/dist/depcomp
U xsrc/external/mit/pixman/dist/meson_options.txt
U xsrc/external/mit/pixman/dist/missing
U xsrc/external/mit/pixman/dist/configure
U xsrc/external/mit/pixman/dist/test-driver
U xsrc/external/mit/pixman/dist/Makefile.am
U xsrc/external/mit/pixman/dist/install-sh
U xsrc/external/mit/pixman/dist/Makefile.win32.common
U xsrc/external/mit/pixman/dist/arm-simd-test.S
U xsrc/external/mit/pixman/dist/aclocal.m4
U xsrc/external/mit/pixman/dist/pixman-1.pc.in
U xsrc/external/mit/pixman/dist/ChangeLog
U xsrc/external/mit/pixman/dist/meson.build
U xsrc/external/mit/pixman/dist/AUTHORS
U xsrc/external/mit/pixman/dist/NEWS
U xsrc/external/mit/pixman/dist/compile
U xsrc/external/mit/pixman/dist/config.guess
U xsrc/external/mit/pixman/dist/COPYING
U xsrc/external/mit/pixman/dist/Makefile.in
U xsrc/external/mit/pixman/dist/Makefile.win32
U xsrc/external/mit/pixman/dist/configure.ac
U xsrc/external/mit/pixman/dist/config.sub
U xsrc/external/mit/pixman/dist/ltmain.sh
U xsrc/external/mit/pixman/dist/INSTALL
U xsrc/external/mit/pixman/dist/config.h.in
N xsrc/external/mit/pixman/dist/a64-neon-test.S
U xsrc/external/mit/pixman/dist/README
U xsrc/external/mit/pixman/dist/pixman-1-uninstalled.pc.in
U xsrc/external/mit/pixman/dist/neon-test.S
U xsrc/external/mit/pixman/dist/test/infinite-loop.c
U xsrc/external/mit/pixman/dist/test/radial-perf-test.c
U xsrc/external/mit/pixman/dist/test/cover-test.c
U xsrc/external/mit/pixman/dist/test/stress-test.c
U xsrc/external/mit/pixman/dist/test/utils.c
U xsrc/external/mit/pixman/dist/test/region-test.c
U xsrc/external/mit/pixman/dist/test/prng-test.c
U xsrc/external/mit/pixman/dist/test/alphamap.c
U xsrc/external/mit/pixman/dist/test/fetch-test.c
U xsrc/external/mit/pixman/dist/test/lowlevel-blt-bench.c
U xsrc/external/mit/pixman/dist/test/region-translate-test.c
U xsrc/external/mit/pixman/dist/test/utils-prng.h
U xsrc/external/mit/pixman/dist/test/blitters-test.c
U xsrc/external/mit/pixman/dist/test/pixel-test.c
U xsrc/external/mit/pixman/dist/test/scaling-crash-test.c
U xsrc/external/mit/pixman/dist/test/matrix-test.c
U xsrc/external/mit/pixman/dist/test/tolerance-test.c
U xsrc/external/mit/pixman/dist/test/trap-crasher.c
U xsrc/external/mit/pixman/dist/test/filter-reduction-test.c
U xsrc/external/mit/pixman/dist/test/utils.h
U xsrc/external/mit/pixman/dist/test/scaling-helpers-test.c
U xsrc/external/mit/pixman/dist/test/Makefile.in
U xsrc/external/mit/pixman/dist/test/affine-test.c
U xsrc/external/mit/pixman/dist/test/meson.build
U xsrc/external/mit/pixman/dist/test/radial-invalid.c
U xsrc/external/mit/pixman/dist/test/thread-test.c
U xsrc/external/mit/pixman/dist/test/affine-bench.c
U xsrc/external/mit/pixman/dist/test/gradient-crash-test.c
U xsrc/external/mit/pixman/dist/test/combiner-test.c
U xsrc/external/mit/pixman/dist/test/rotate-test.c
U xsrc/external/mit/pixman/dist/test/scaling-bench.c
U xsrc/external/mit/pixman/dist/test/alpha-loop.c
U xsrc/external/mit/pixman/dist/test/pdf-op-test.c
U xsrc/external/mit/pixman/dist/test/Makefile.am
U xsrc/external/mit/pixman/dist/test/composite.c
U xsrc/external/mit/pixman/dist/test/region-contains-test.c
U xsrc/external/mit/pixman/dist/test/oob-test.c
U xsrc/external/mit/pixman/dist/test/check-formats.c
U xsrc/external/mit/pixman/dist/test/composite-traps-test.c
U xsrc/external/mit/pixman/dist/test/utils-prng.c
U xsrc/external/mit/pixman/dist/test/fence-image-self-test.c
U xsrc/external/mit/pixman/dist/test/solid-test.c
U xsrc/external/mit/pixman/dist/test/glyph-test.c
U xsrc/external/mit/pixman/dist/test/Makefile.sources
U xsrc/external/mit/pixman/dist/test/a1-trap-test.c
U xsrc/external/mit/pixman/dist/test/scaling-test.c
U xsrc/external/mit/pixman/dist/pixman/pixman-mips-dspr2.h
U xsrc/external/mit/pixman/dist/pixman/pixman-noop.c
U xsrc/external/mit/pixman/dist/pixman/loongson-mmintrin.h
U xsrc/external/mit/pixman/dist/pixman/pixman-edge-accessors.c
C xsrc/external/mit/pixman/dist/pixman/pixman-ppc.c
U xsrc/external/mit/pixman/dist/pixman/pixman-accessor.h
U xsrc/external/mit/pixman/dist/pixman/pixman-conical-gradient.c
N xsrc/external/mit/pixman/dist/pixman/pixman-arma64-neon-asm.h
U xsrc/external/mit/pixman/dist/pixman/pixman-glyph.c
N xsrc/external/mit/pixman/dist/pixman/pixman-arma64-neon-asm-bilinear.S
U xsrc/external/mit/pixman/dist/pixman/pixman-mips-dspr2-asm.h
N xsrc/external/mit/pixman/dist/pixman/pixman-arma64-neon-asm.S
C xsrc/external/mit/pixman/dist/pixman/pixman-arm.c
U xsrc/external/mit/pixman/dist/pixman/Makefile.win32
U xsrc/external/mit/pixman/dist/pixman/pixman-mips-dspr2-asm.S
U xsrc/external/mit/pixman/dist/pixman/pixman-utils.c
U xsrc/external/mit/pixman/dist/pixman/pixma

CVS commit: xsrc/external/mit/pixman

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 03:35:26 UTC 2022

Modified Files:
xsrc/external/mit/pixman/dist/pixman: pixman-arm.c pixman-bits-image.c
pixman-inlines.h pixman-mmx.c pixman-ppc.c pixman-private.h
pixman-x86.c pixman.h
xsrc/external/mit/pixman/include: config.h

Log Message:
merge pixman 0.42.2.

this reverts a local change to pixman.h as upstream have fixed it
in a different way.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/pixman/dist/pixman/pixman-arm.c \
xsrc/external/mit/pixman/dist/pixman/pixman-ppc.c \
xsrc/external/mit/pixman/dist/pixman/pixman-x86.c
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/pixman/dist/pixman/pixman-inlines.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/pixman/dist/pixman/pixman-mmx.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/pixman/dist/pixman/pixman-private.h
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/pixman/dist/pixman/pixman.h
cvs rdiff -u -r1.23 -r1.24 xsrc/external/mit/pixman/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/pixman

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 03:35:26 UTC 2022

Modified Files:
xsrc/external/mit/pixman/dist/pixman: pixman-arm.c pixman-bits-image.c
pixman-inlines.h pixman-mmx.c pixman-ppc.c pixman-private.h
pixman-x86.c pixman.h
xsrc/external/mit/pixman/include: config.h

Log Message:
merge pixman 0.42.2.

this reverts a local change to pixman.h as upstream have fixed it
in a different way.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/pixman/dist/pixman/pixman-arm.c \
xsrc/external/mit/pixman/dist/pixman/pixman-ppc.c \
xsrc/external/mit/pixman/dist/pixman/pixman-x86.c
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/pixman/dist/pixman/pixman-inlines.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/pixman/dist/pixman/pixman-mmx.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/pixman/dist/pixman/pixman-private.h
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/pixman/dist/pixman/pixman.h
cvs rdiff -u -r1.23 -r1.24 xsrc/external/mit/pixman/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/pixman/dist/pixman/pixman-arm.c
diff -u xsrc/external/mit/pixman/dist/pixman/pixman-arm.c:1.2 xsrc/external/mit/pixman/dist/pixman/pixman-arm.c:1.3
--- xsrc/external/mit/pixman/dist/pixman/pixman-arm.c:1.2	Thu Jan 31 22:46:51 2013
+++ xsrc/external/mit/pixman/dist/pixman/pixman-arm.c	Sat Nov 12 03:35:25 2022
@@ -176,6 +176,31 @@ detect_cpu_features (void)
 return features;
 }
 
+#elif defined (_3DS) /* 3DS homebrew (devkitARM) */
+
+static arm_cpu_features_t
+detect_cpu_features (void)
+{
+arm_cpu_features_t features = 0;
+
+features |= ARM_V6;
+
+return features;
+}
+
+#elif defined (PSP2) || defined (__SWITCH__)
+/* Vita (VitaSDK) or Switch (devkitA64) homebrew */
+
+static arm_cpu_features_t
+detect_cpu_features (void)
+{
+arm_cpu_features_t features = 0;
+
+features |= ARM_NEON;
+
+return features;
+}
+
 #elif defined (__NetBSD__) /* NetBSD */
 
 #include 
@@ -254,5 +279,11 @@ _pixman_arm_get_implementations (pixman_
 	imp = _pixman_implementation_create_arm_neon (imp);
 #endif
 
+#ifdef USE_ARM_A64_NEON
+/* neon is a part of aarch64 */
+if (!_pixman_disabled ("arm-neon"))
+imp = _pixman_implementation_create_arm_neon (imp);
+#endif
+
 return imp;
 }
Index: xsrc/external/mit/pixman/dist/pixman/pixman-ppc.c
diff -u xsrc/external/mit/pixman/dist/pixman/pixman-ppc.c:1.2 xsrc/external/mit/pixman/dist/pixman/pixman-ppc.c:1.3
--- xsrc/external/mit/pixman/dist/pixman/pixman-ppc.c:1.2	Thu Feb  7 13:30:48 2013
+++ xsrc/external/mit/pixman/dist/pixman/pixman-ppc.c	Sat Nov 12 03:35:25 2022
@@ -68,6 +68,24 @@ pixman_have_vmx (void)
 return have_vmx;
 }
 
+#elif defined (__FreeBSD__)
+#include 
+#include 
+
+static pixman_bool_t
+pixman_have_vmx (void)
+{
+
+unsigned long cpufeatures;
+int have_vmx;
+
+if (elf_aux_info(AT_HWCAP, &cpufeatures, sizeof(cpufeatures)))
+return FALSE;
+
+have_vmx = cpufeatures & PPC_FEATURE_HAS_ALTIVEC;
+return have_vmx;
+}
+
 #elif defined (__linux__)
 
 #include 
Index: xsrc/external/mit/pixman/dist/pixman/pixman-x86.c
diff -u xsrc/external/mit/pixman/dist/pixman/pixman-x86.c:1.2 xsrc/external/mit/pixman/dist/pixman/pixman-x86.c:1.3
--- xsrc/external/mit/pixman/dist/pixman/pixman-x86.c:1.2	Thu Oct 13 23:26:59 2016
+++ xsrc/external/mit/pixman/dist/pixman/pixman-x86.c	Sat Nov 12 03:35:25 2022
@@ -190,6 +190,7 @@ detect_cpu_features (void)
 	memcpy (vendor + 8, &c, 4);
 
 	if (strcmp (vendor, "AuthenticAMD") == 0 ||
+	strcmp (vendor, "HygonGenuine") == 0 ||
 	strcmp (vendor, "Geode by NSC") == 0)
 	{
 	pixman_cpuid (0x8000, &a, &b, &c, &d);

Index: xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c
diff -u xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.10 xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.11
--- xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.10	Mon Mar  4 08:36:42 2019
+++ xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c	Sat Nov 12 03:35:25 2022
@@ -35,6 +35,7 @@
 #include "pixman-private.h"
 #include "pixman-combine32.h"
 #include "pixman-inlines.h"
+#include "dither/blue-noise-64x64.h"
 
 /* Fetch functions */
 
@@ -190,8 +191,8 @@ bits_image_fetch_pixel_bilinear_float (b
 *ret = bilinear_interpolation_float (tl, tr, bl, br, distx, disty);
 }
 
-static force_inline void accum_32(int *satot, int *srtot,
-  int *sgtot, int *sbtot,
+static force_inline void accum_32(unsigned int *satot, unsigned int *srtot,
+  unsigned int *sgtot, unsigned int *sbtot,
   const void *p, pixman_fixed_t f)
 {
 uint32_t pixel = *(uint32_t *)p;
@@ -202,8 +203,9 @@ static force_inline void accum_32(int *s
 *satot += (int)ALPHA_8 (pixel) * f;
 }
 

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sat Nov 12 04:00:57 UTC 2022

Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/pixman: Makefile shlib_version

Log Message:
updates for pixman 0.42.2.

this enables NEON for arm64.  maybe firefox will be faster on pbp...


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.38 -r1.39 src/external/mit/xorg/lib/pixman/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/pixman/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sat Nov 12 04:00:57 UTC 2022

Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/pixman: Makefile shlib_version

Log Message:
updates for pixman 0.42.2.

this enables NEON for arm64.  maybe firefox will be faster on pbp...


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.38 -r1.39 src/external/mit/xorg/lib/pixman/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/pixman/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.101 src/distrib/sets/lists/xbase/shl.mi:1.102
--- src/distrib/sets/lists/xbase/shl.mi:1.101	Sat Nov 12 02:20:15 2022
+++ src/distrib/sets/lists/xbase/shl.mi	Sat Nov 12 04:00:57 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.101 2022/11/12 02:20:15 mrg Exp $
+# $NetBSD: shl.mi,v 1.102 2022/11/12 04:00:57 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -202,7 +202,7 @@
 ./usr/X11R7/lib/libpciaccess.so.0.4		xbase-libpciaccess-lib		xorg,compatx11file
 ./usr/X11R7/lib/libpixman-1.so			xbase-pixman-lib		xorg,compatx11file
 ./usr/X11R7/lib/libpixman-1.so.2		xbase-pixman-lib		xorg,compatx11file
-./usr/X11R7/lib/libpixman-1.so.2.2		xbase-pixman-lib		xorg,compatx11file
+./usr/X11R7/lib/libpixman-1.so.2.3		xbase-pixman-lib		xorg,compatx11file
 ./usr/X11R7/lib/libxcb-atom.so			xbase-xcb-util-lib		xorg,compatx11file
 ./usr/X11R7/lib/libxcb-atom.so.1		xbase-xcb-util-lib		xorg,compatx11file
 ./usr/X11R7/lib/libxcb-atom.so.1.0		xbase-xcb-util-lib		xorg,compatx11file

Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.67 src/distrib/sets/lists/xdebug/shl.mi:1.68
--- src/distrib/sets/lists/xdebug/shl.mi:1.67	Sat Nov 12 02:20:15 2022
+++ src/distrib/sets/lists/xdebug/shl.mi	Sat Nov 12 04:00:57 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.67 2022/11/12 02:20:15 mrg Exp $
+# $NetBSD: shl.mi,v 1.68 2022/11/12 04:00:57 mrg Exp $
 ./usr/libdata/debug/usr/X11R7/lib	base-sys-usr		xorg,debug,compatx11dir
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug	obsolete		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug	obsolete		obsolete
@@ -67,7 +67,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/libglapi.so.1.0.debug	xdebug-libglapi-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug	xdebug-obsolete			xorg,obsolete,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.4.debug	xdebug-libpciaccess-debug		xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.2.debug	xdebug-pixman-debug		xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.3.debug	xdebug-pixman-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-atom.so.1.0.debug	xdebug-xcb-util-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-aux.so.0.0.debug	xdebug-xcb-util-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-composite.so.0.1.debug	xdebug-libxcb-debug		xorg,debug,compatx11file

Index: src/external/mit/xorg/lib/pixman/Makefile
diff -u src/external/mit/xorg/lib/pixman/Makefile:1.38 src/external/mit/xorg/lib/pixman/Makefile:1.39
--- src/external/mit/xorg/lib/pixman/Makefile:1.38	Mon Apr 26 21:32:49 2021
+++ src/external/mit/xorg/lib/pixman/Makefile	Sat Nov 12 04:00:57 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.38 2021/04/26 21:32:49 christos Exp $
+#	$NetBSD: Makefile,v 1.39 2022/11/12 04:00:57 mrg Exp $
 
 NOLINT=	1	# defined
 
@@ -90,6 +90,17 @@ AFLAGS+=	${${ACTIVE_CC} == "clang" :? -f
 #CPPFLAGS+=	-DUSE_ARM_IWMMXT
 .endif
 
+.if !empty(MACHINE_ARCH:Maarch64*)
+# ARM64 NEON
+SRCS+=		pixman-arm-neon.c			\
+		pixman-arma64-neon-asm.S		\
+		pixman-arma64-neon-asm-bilinear.S
+CPPFLAGS+=	-DUSE_ARM_A64_NEON
+
+# XXX: not sure if needed?
+#AFLAGS+=	${${ACTIVE_CC} == "clang" :? -fno-integrated-as :}
+.endif
+
 .if !empty(MACHINE_ARCH:Mmips*64el) && empty(COPTS:M-march=*)
 # Loongson MMI
 SRCS+=		pixman-mmx.c

Index: src/external/mit/xorg/lib/pixman/shlib_version
diff -u src/external/mit/xorg/lib/pixman/shlib_version:1.6 src/external/mit/xorg/lib/pixman/shlib_version:1.7
--- src/external/mit/xorg/lib/pixman/shlib_version:1.6	Wed Jun  5 09:04:16 2013
+++ src/external/mit/xorg/lib/pixman/shlib_version	Sat Nov 12 04:00:57 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.6 2013/06/05 09:04:16 mrg Exp $
+#	$NetBSD: shlib_version,v 1.7 2022/11/12 04:00:57 mrg Exp $
 #
 major=2
-minor=2
+minor=3

CVS commit: xsrc/external/mit/libXrender/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 06:05:13 UTC 2022

Removed Files:
xsrc/external/mit/libXrender/include: config.h

Log Message:
remove unused file.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r0 xsrc/external/mit/libXrender/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/libXrender/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Nov 12 06:05:13 UTC 2022

Removed Files:
xsrc/external/mit/libXrender/include: config.h

Log Message:
remove unused file.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r0 xsrc/external/mit/libXrender/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/riscv/include

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sat Nov 12 07:05:41 UTC 2022

Modified Files:
src/sys/arch/riscv/include: sysreg.h

Log Message:
Use uintptr_t consistently rather than register_t


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/riscv/include/sysreg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/riscv/include

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sat Nov 12 07:05:41 UTC 2022

Modified Files:
src/sys/arch/riscv/include: sysreg.h

Log Message:
Use uintptr_t consistently rather than register_t


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/riscv/include/sysreg.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/arch/riscv/include/sysreg.h
diff -u src/sys/arch/riscv/include/sysreg.h:1.22 src/sys/arch/riscv/include/sysreg.h:1.23
--- src/sys/arch/riscv/include/sysreg.h:1.22	Fri Nov 11 01:18:32 2022
+++ src/sys/arch/riscv/include/sysreg.h	Sat Nov 12 07:05:40 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: sysreg.h,v 1.22 2022/11/11 01:18:32 simonb Exp $ */
+/* $NetBSD: sysreg.h,v 1.23 2022/11/12 07:05:40 skrll Exp $ */
 
 /*
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -177,18 +177,18 @@ riscvreg_fcsr_write_frm(uint32_t __new)
 #define	SR_KERNEL	(SR_SIE | SR_UIE)
 #endif
 
-static inline register_t
+static inline uintptr_t
 riscvreg_status_read(void)
 {
-	register_t __sr;
+	uintptr_t __sr;
 	__asm("csrr\t%0, sstatus" : "=r"(__sr));
 	return __sr;
 }
 
-static inline register_t
-riscvreg_status_clear(register_t __mask)
+static inline uintptr_t
+riscvreg_status_clear(uintptr_t __mask)
 {
-	register_t __sr;
+	uintptr_t __sr;
 	if (__builtin_constant_p(__mask) && __mask < 0x20) {
 		__asm("csrrci\t%0, sstatus, %1" : "=r"(__sr) : "i"(__mask));
 	} else {
@@ -197,10 +197,10 @@ riscvreg_status_clear(register_t __mask)
 	return __sr;
 }
 
-static inline register_t
-riscvreg_status_set(register_t __mask)
+static inline uintptr_t
+riscvreg_status_set(uintptr_t __mask)
 {
-	register_t __sr;
+	uintptr_t __sr;
 	if (__builtin_constant_p(__mask) && __mask < 0x20) {
 		__asm("csrrsi\t%0, sstatus, %1" : "=r"(__sr) : "i"(__mask));
 	} else {

CVS commit: src/sys/arch/riscv/include

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sat Nov 12 07:34:18 UTC 2022

Modified Files:
src/sys/arch/riscv/include: pte.h

Log Message:
Note some SV39 PTE bits defined in extensions.

Fix pte_nv_entry for the kernel.

Fix pte_pde_ptpage. PTE.{X,W,R} must be zero for pointer to next level.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/riscv/include/pte.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/riscv/include

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sat Nov 12 07:34:18 UTC 2022

Modified Files:
src/sys/arch/riscv/include: pte.h

Log Message:
Note some SV39 PTE bits defined in extensions.

Fix pte_nv_entry for the kernel.

Fix pte_pde_ptpage. PTE.{X,W,R} must be zero for pointer to next level.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/riscv/include/pte.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/arch/riscv/include/pte.h
diff -u src/sys/arch/riscv/include/pte.h:1.10 src/sys/arch/riscv/include/pte.h:1.11
--- src/sys/arch/riscv/include/pte.h:1.10	Tue Oct 18 06:44:43 2022
+++ src/sys/arch/riscv/include/pte.h	Sat Nov 12 07:34:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pte.h,v 1.10 2022/10/18 06:44:43 skrll Exp $ */
+/* $NetBSD: pte.h,v 1.11 2022/11/12 07:34:18 skrll Exp $ */
 
 /*
  * Copyright (c) 2014, 2019, 2021 The NetBSD Foundation, Inc.
@@ -56,8 +56,14 @@ typedef uint32_t pd_entry_t;
 #define	NSEGPG		NPTEPG
 #define	NPDEPG		NPTEPG
 
+
+/* HardWare PTE bits SV39 */
+#define PTE_N		__BIT(63)	// Svnapot
+#define PTE_PBMT	__BITS(62, 61)	// Svpbmt
+#define PTE_reserved0	__BITS(60, 54)	//
+
 /* Software PTE bits. */
-#define	PTE_RSW		__BITS(9,8)
+#define	PTE_RSW		__BITS(9, 8)
 #define	PTE_WIRED	__BIT(9)
 
 /* Hardware PTE bits. */
@@ -155,7 +161,7 @@ pte_to_paddr(pt_entry_t pte)
 static inline pt_entry_t
 pte_nv_entry(bool kernel_p)
 {
-	return kernel_p ? PTE_G : 0;
+	return 0;
 }
 
 static inline pt_entry_t
@@ -265,7 +271,7 @@ pte_pde_pdetab(paddr_t pa, bool kernel_p
 static inline pd_entry_t
 pte_pde_ptpage(paddr_t pa, bool kernel_p)
 {
-	return PTE_V | PTE_X | PTE_W | PTE_R | (pa >> PAGE_SHIFT) << PTE_PPN_SHIFT;
+	return PTE_V | (pa >> PAGE_SHIFT) << PTE_PPN_SHIFT;
 }
 
 static inline bool

CVS commit: src/external/mit/xorg/lib/pixman

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sat Nov 12 07:43:33 UTC 2022

Modified Files:
src/external/mit/xorg/lib/pixman: Makefile

Log Message:
disable arm64 NEON for now.  my X server exits for unknown reasons..


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/external/mit/xorg/lib/pixman/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/mit/xorg/lib/pixman

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sat Nov 12 07:43:33 UTC 2022

Modified Files:
src/external/mit/xorg/lib/pixman: Makefile

Log Message:
disable arm64 NEON for now.  my X server exits for unknown reasons..


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/external/mit/xorg/lib/pixman/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/pixman/Makefile
diff -u src/external/mit/xorg/lib/pixman/Makefile:1.39 src/external/mit/xorg/lib/pixman/Makefile:1.40
--- src/external/mit/xorg/lib/pixman/Makefile:1.39	Sat Nov 12 04:00:57 2022
+++ src/external/mit/xorg/lib/pixman/Makefile	Sat Nov 12 07:43:33 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.39 2022/11/12 04:00:57 mrg Exp $
+#	$NetBSD: Makefile,v 1.40 2022/11/12 07:43:33 mrg Exp $
 
 NOLINT=	1	# defined
 
@@ -90,7 +90,7 @@ AFLAGS+=	${${ACTIVE_CC} == "clang" :? -f
 #CPPFLAGS+=	-DUSE_ARM_IWMMXT
 .endif
 
-.if !empty(MACHINE_ARCH:Maarch64*)
+.if !empty(MACHINE_ARCH:Maarch64*) && 0
 # ARM64 NEON
 SRCS+=		pixman-arm-neon.c			\
 		pixman-arma64-neon-asm.S		\

CVS commit: src/sys/dev/bus_dma

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sat Nov 12 07:48:34 UTC 2022

Modified Files:
src/sys/dev/bus_dma: bus_dmamem_common.c

Log Message:
Trailing whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/bus_dma/bus_dmamem_common.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/bus_dma

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sat Nov 12 07:48:34 UTC 2022

Modified Files:
src/sys/dev/bus_dma: bus_dmamem_common.c

Log Message:
Trailing whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/bus_dma/bus_dmamem_common.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/dev/bus_dma/bus_dmamem_common.c
diff -u src/sys/dev/bus_dma/bus_dmamem_common.c:1.4 src/sys/dev/bus_dma/bus_dmamem_common.c:1.5
--- src/sys/dev/bus_dma/bus_dmamem_common.c:1.4	Sun Sep  6 15:27:22 2020
+++ src/sys/dev/bus_dma/bus_dmamem_common.c	Sat Nov 12 07:48:34 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_dmamem_common.c,v 1.4 2020/09/06 15:27:22 riastradh Exp $	*/
+/*	$NetBSD: bus_dmamem_common.c,v 1.5 2022/11/12 07:48:34 skrll Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 2009 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 
 #include 			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: bus_dmamem_common.c,v 1.4 2020/09/06 15:27:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dmamem_common.c,v 1.5 2022/11/12 07:48:34 skrll Exp $");
 
 #include 
 #include 
@@ -73,7 +73,7 @@ _bus_dmamem_alloc_range_common(bus_dma_t
 &mlist, nsegs, (flags & BUS_DMA_NOWAIT) == 0);
 	if (__predict_false(error != 0))
 		return (error);
-	
+
 	/*
 	 * Compute the location, size, and number of segments actually
 	 * returned by the VM system.
@@ -156,7 +156,7 @@ _bus_dmamem_map_common(bus_dma_tag_t t,
 	va = uvm_km_alloc(kernel_map, size, 0, UVM_KMF_VAONLY | kmflags);
 	if (__predict_false(va == 0))
 		return (ENOMEM);
-	
+
 	*kvap = (void *)va;
 
 	for (curseg = 0; curseg < nsegs; curseg++) {