Module Name: src
Committed By: andvar
Date: Wed Aug 9 09:36:26 UTC 2023
Modified Files:
src/distrib/sets/lists/debug: module.md.amd64
src/distrib/sets/lists/modules: md.amd64
src/sys/arch/amd64/conf: GENERIC
src/sys/external/bsd/drm2/dist/include/drm: drm_pciids.h
src/sys/modules: Makefile
Log Message:
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.
Pull up to netbsd-10 is needed.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/debug/module.md.amd64
cvs rdiff -u -r1.99 -r1.100 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.604 -r1.605 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/include/drm/drm_pciids.h
cvs rdiff -u -r1.278 -r1.279 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.13 src/distrib/sets/lists/debug/module.md.amd64:1.14
--- src/distrib/sets/lists/debug/module.md.amd64:1.13 Tue Dec 20 04:10:11 2022
+++ src/distrib/sets/lists/debug/module.md.amd64 Wed Aug 9 09:36:26 2023
@@ -1,4 +1,4 @@
-# $NetBSD: module.md.amd64,v 1.13 2022/12/20 04:10:11 pgoyette Exp $
+# $NetBSD: module.md.amd64,v 1.14 2023/08/09 09:36:26 andvar 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
@@ -205,6 +205,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.99 src/distrib/sets/lists/modules/md.amd64:1.100
--- src/distrib/sets/lists/modules/md.amd64:1.99 Tue Dec 20 04:10:11 2022
+++ src/distrib/sets/lists/modules/md.amd64 Wed Aug 9 09:36:26 2023
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.99 2022/12/20 04:10:11 pgoyette Exp $
+# $NetBSD: md.amd64,v 1.100 2023/08/09 09:36:26 andvar Exp $
#
./@MODULEDIR@/acpiacad modules-base-kernel kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod modules-base-kernel kmod
@@ -222,6 +222,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.604 src/sys/arch/amd64/conf/GENERIC:1.605
--- src/sys/arch/amd64/conf/GENERIC:1.604 Sat Jul 15 22:16:00 2023
+++ src/sys/arch/amd64/conf/GENERIC Wed Aug 9 09:36:26 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.604 2023/07/15 22:16:00 riastradh Exp $
+# $NetBSD: GENERIC,v 1.605 2023/08/09 09:36:26 andvar 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.604 $"
+#ident "GENERIC-$Revision: 1.605 $"
maxusers 64 # estimated number of users
@@ -471,7 +471,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.5
--- 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 Wed Aug 9 09:36:26 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.5 2023/08/09 09:36:26 andvar 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.278 src/sys/modules/Makefile:1.279
--- src/sys/modules/Makefile:1.278 Sun May 7 12:41:49 2023
+++ src/sys/modules/Makefile Wed Aug 9 09:36:26 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.278 2023/05/07 12:41:49 skrll Exp $
+# $NetBSD: Makefile,v 1.279 2023/08/09 09:36:26 andvar Exp $
.include <bsd.own.mk>
@@ -347,7 +347,6 @@ SUBDIR+= savagedrm
SUBDIR+= sisdrm
SUBDIR+= tdfxdrm
SUBDIR+= viac7temp
-SUBDIR+= viadrmums
.endif
.if ${MACHINE_ARCH} == "i386" || \
@@ -368,6 +367,7 @@ SUBDIR+= compat_linux
SUBDIR+= drmkms_agp
SUBDIR+= i915drm
SUBDIR+= i915drmkms
+SUBDIR+= viadrmums
#
# ISA modules
#
