Module Name: src
Committed By: martin
Date: Thu Aug 17 09:57:28 UTC 2023
Modified Files:
src/distrib/sets/lists/debug [netbsd-10]: module.md.amd64
src/distrib/sets/lists/modules [netbsd-10]: md.amd64
src/sys/arch/amd64/conf [netbsd-10]: GENERIC
src/sys/external/bsd/drm2/dist/include/drm [netbsd-10]: drm_pciids.h
src/sys/modules [netbsd-10]: Makefile
Log Message:
Pull up following revision(s) (requested by andvar in ticket #329):
distrib/sets/lists/modules/md.amd64: revision 1.100
sys/external/bsd/drm2/dist/include/drm/drm_pciids.h: revision 1.5
sys/arch/amd64/conf/GENERIC: revision 1.605
sys/modules/Makefile: revision 1.279
distrib/sets/lists/debug/module.md.amd64: revision 1.14
viadrmums(4): build legacy VIA DRM UMS driver module for amd64.
This driver is not built-in by default, thus loadable module can help (un)lucky
owners of 64-bit capable VIA (Nano/Eden) systems or early AMD/Intel systems
with some VIA chipsets, which include VIA integrated graphics.
I also boldly added product IDs for few later models from VX8xx/VX9xx chipsets
without 3D support (DX9_0) to "expand" the driver support to more systems.
Tested successfully basic functionality on VX800, and partially successfully
on VX900 (on VX900 Xorg failed to initialize due to openchrome related issues,
viadrmums attaches and it is by used the driver).
Didn't test on VX855, I don't have one.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.2.1 src/distrib/sets/lists/debug/module.md.amd64
cvs rdiff -u -r1.98 -r1.98.2.1 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.599.4.1 -r1.599.4.2 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.4 -r1.4.4.1 \
src/sys/external/bsd/drm2/dist/include/drm/drm_pciids.h
cvs rdiff -u -r1.274 -r1.274.2.1 src/sys/modules/Makefile
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/debug/module.md.amd64
diff -u src/distrib/sets/lists/debug/module.md.amd64:1.12 src/distrib/sets/lists/debug/module.md.amd64:1.12.2.1
--- src/distrib/sets/lists/debug/module.md.amd64:1.12 Thu Jul 28 22:00:23 2022
+++ src/distrib/sets/lists/debug/module.md.amd64 Thu Aug 17 09:57:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: module.md.amd64,v 1.12 2022/07/28 22:00:23 riastradh Exp $
+# $NetBSD: module.md.amd64,v 1.12.2.1 2023/08/17 09:57:28 martin Exp $
./usr/libdata/debug/@MODULEDIR@/acpiacad modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/acpiacad/acpiacad.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/acpibat modules-base-kernel kmod,debug
@@ -203,6 +203,8 @@
./usr/libdata/debug/@MODULEDIR@/tvpll/tvpll.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/ubsec modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/ubsec/ubsec.kmod.debug modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/viadrmums modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/viadrmums/viadrmums.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/vmt modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/vmt/vmt.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/wbsio modules-base-kernel kmod,debug
Index: src/distrib/sets/lists/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.98 src/distrib/sets/lists/modules/md.amd64:1.98.2.1
--- src/distrib/sets/lists/modules/md.amd64:1.98 Wed Sep 7 11:37:25 2022
+++ src/distrib/sets/lists/modules/md.amd64 Thu Aug 17 09:57:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.98 2022/09/07 11:37:25 martin Exp $
+# $NetBSD: md.amd64,v 1.98.2.1 2023/08/17 09:57:28 martin Exp $
#
./@MODULEDIR@/acpiacad modules-base-kernel kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod modules-base-kernel kmod
@@ -220,6 +220,8 @@
./@MODULEDIR@/tvpll/tvpll.kmod modules-base-kernel kmod
./@MODULEDIR@/ubsec modules-base-kernel kmod
./@MODULEDIR@/ubsec/ubsec.kmod modules-base-kernel kmod
+./@MODULEDIR@/viadrmums modules-base-kernel kmod
+./@MODULEDIR@/viadrmums/viadrmums.kmod modules-base-kernel kmod
./@MODULEDIR@/vmt modules-base-kernel kmod
./@MODULEDIR@/vmt/vmt.kmod modules-base-kernel kmod
./@MODULEDIR@/wbsio modules-base-kernel kmod
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.599.4.1 src/sys/arch/amd64/conf/GENERIC:1.599.4.2
--- src/sys/arch/amd64/conf/GENERIC:1.599.4.1 Tue Aug 1 14:06:36 2023
+++ src/sys/arch/amd64/conf/GENERIC Thu Aug 17 09:57:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.599.4.1 2023/08/01 14:06:36 martin Exp $
+# $NetBSD: GENERIC,v 1.599.4.2 2023/08/17 09:57:28 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.599.4.1 $"
+#ident "GENERIC-$Revision: 1.599.4.2 $"
maxusers 64 # estimated number of users
@@ -467,7 +467,8 @@ radeondrmkmsfb* at radeonfbbus?
nouveau* at pci? dev ? function ?
nouveaufb* at nouveaufbbus?
-# DRMUMS drivers
+# DRMUMS drivers -- make them loadable, but not statically linked in
+options DRM_LEGACY
#viadrmums* at drm?
#options DRM_MAX_RESOLUTION_HORIZONTAL=1920 # Limit DRM size in horizontal dimension
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_pciids.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_pciids.h:1.4 src/sys/external/bsd/drm2/dist/include/drm/drm_pciids.h:1.4.4.1
--- src/sys/external/bsd/drm2/dist/include/drm/drm_pciids.h:1.4 Sat Dec 18 23:45:46 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_pciids.h Thu Aug 17 09:57:28 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_pciids.h,v 1.4 2021/12/18 23:45:46 riastradh Exp $ */
+/* $NetBSD: drm_pciids.h,v 1.4.4.1 2023/08/17 09:57:28 martin Exp $ */
/* SPDX-License-Identifier: MIT */
#define radeon_PCI_IDS \
@@ -781,6 +781,9 @@
{0x1106, 0x3230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \
{0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_PRO_GROUP_A}, \
{0x1106, 0x3371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \
+ {0x1106, 0x1122, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \
+ {0x1106, 0x5122, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \
+ {0x1106, 0x7122, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \
{0, 0, 0}
#define i810_PCI_IDS \
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.274 src/sys/modules/Makefile:1.274.2.1
--- src/sys/modules/Makefile:1.274 Sat Dec 3 01:04:42 2022
+++ src/sys/modules/Makefile Thu Aug 17 09:57:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.274 2022/12/03 01:04:42 brad Exp $
+# $NetBSD: Makefile,v 1.274.2.1 2023/08/17 09:57:28 martin Exp $
.include <bsd.own.mk>
@@ -346,7 +346,6 @@ SUBDIR+= savagedrm
SUBDIR+= sisdrm
SUBDIR+= tdfxdrm
SUBDIR+= viac7temp
-SUBDIR+= viadrmums
.endif
.if ${MACHINE_ARCH} == "i386" || \
@@ -362,6 +361,7 @@ SUBDIR+= drmkms_sched
SUBDIR+= drmkms_ttm
SUBDIR+= i915drm
SUBDIR+= i915drmkms
+SUBDIR+= viadrmums
#
# ISA modules
#
