Module Name: src
Committed By: riastradh
Date: Thu Jul 28 22:00:24 UTC 2022
Modified Files:
src/distrib/sets/lists/debug: module.md.amd64 module.md.i386
src/distrib/sets/lists/modules: md.amd64 md.i386
src/sys/modules: Makefile
Log Message:
drm: Hook up the drmkms modules to the build.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/debug/module.md.amd64
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/debug/module.md.i386
cvs rdiff -u -r1.94 -r1.95 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.268 -r1.269 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.11 src/distrib/sets/lists/debug/module.md.amd64:1.12
--- src/distrib/sets/lists/debug/module.md.amd64:1.11 Thu Jul 28 16:45:31 2022
+++ src/distrib/sets/lists/debug/module.md.amd64 Thu Jul 28 22:00:23 2022
@@ -1,4 +1,4 @@
-# $NetBSD: module.md.amd64,v 1.11 2022/07/28 16:45:31 martin Exp $
+# $NetBSD: module.md.amd64,v 1.12 2022/07/28 22:00:23 riastradh 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
@@ -107,14 +107,18 @@
./usr/libdata/debug/@MODULEDIR@/cxdtv/cxdtv.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/drm modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/drm/drm.kmod.debug modules-base-kernel kmod,debug
-./usr/libdata/debug/@MODULEDIR@/drmkms modules-obsolete obsolete
-./usr/libdata/debug/@MODULEDIR@/drmkms/drmkms.kmod.debug modules-obsolete obsolete
-./usr/libdata/debug/@MODULEDIR@/drmkms_agp modules-obsolete obsolete
-./usr/libdata/debug/@MODULEDIR@/drmkms_agp/drmkms_agp.kmod.debug modules-obsolete obsolete
-./usr/libdata/debug/@MODULEDIR@/drmkms_linux modules-obsolete obsolete
-./usr/libdata/debug/@MODULEDIR@/drmkms_linux/drmkms_linux.kmod.debug modules-obsolete obsolete
-./usr/libdata/debug/@MODULEDIR@/drmkms_pci modules-obsolete obsolete
-./usr/libdata/debug/@MODULEDIR@/drmkms_pci/drmkms_pci.kmod.debug modules-obsolete obsolete
+./usr/libdata/debug/@MODULEDIR@/drmkms modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms/drmkms.kmod.debug modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms_agp modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms_agp/drmkms_agp.kmod.debug modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms_linux modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms_linux/drmkms_linux.kmod.debug modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms_pci modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms_pci/drmkms_pci.kmod.debug modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms_sched modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms_sched/drmkms_sched.kmod.debug modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms_ttm modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms_ttm/drmkms_ttm.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/dtrace_syscall_linux modules-base-kernel kmod,dtrace,debug
./usr/libdata/debug/@MODULEDIR@/dtrace_syscall_linux/dtrace_syscall_linux.kmod.debug modules-base-kernel kmod,dtrace,debug
./usr/libdata/debug/@MODULEDIR@/dtrace_syscall_linux32 modules-base-kernel kmod,dtrace,debug
@@ -151,8 +155,8 @@
./usr/libdata/debug/@MODULEDIR@/hpqlb/hpqlb.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/i915drm modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/i915drm/i915drm.kmod.debug modules-base-kernel kmod,debug
-./usr/libdata/debug/@MODULEDIR@/i915drmkms modules-obsolete obsolete
-./usr/libdata/debug/@MODULEDIR@/i915drmkms/i915drmkms.kmod.debug modules-obsolete obsolete
+./usr/libdata/debug/@MODULEDIR@/i915drmkms modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/i915drmkms/i915drmkms.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/ichsmb modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/ichsmb/ichsmb.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/if_iavf modules-base-kernel kmod,debug
Index: src/distrib/sets/lists/debug/module.md.i386
diff -u src/distrib/sets/lists/debug/module.md.i386:1.6 src/distrib/sets/lists/debug/module.md.i386:1.7
--- src/distrib/sets/lists/debug/module.md.i386:1.6 Wed Jul 27 20:34:30 2022
+++ src/distrib/sets/lists/debug/module.md.i386 Thu Jul 28 22:00:23 2022
@@ -1,4 +1,4 @@
-# $NetBSD: module.md.i386,v 1.6 2022/07/27 20:34:30 pgoyette Exp $
+# $NetBSD: module.md.i386,v 1.7 2022/07/28 22:00:23 riastradh 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
@@ -61,14 +61,18 @@
./usr/libdata/debug/@MODULEDIR@/cxdtv/cxdtv.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/drm modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/drm/drm.kmod.debug modules-base-kernel kmod,debug
-./usr/libdata/debug/@MODULEDIR@/drmkms modules-obsolete obsolete
-./usr/libdata/debug/@MODULEDIR@/drmkms/drmkms.kmod.debug modules-obsolete obsolete
-./usr/libdata/debug/@MODULEDIR@/drmkms_agp modules-obsolete obsolete
-./usr/libdata/debug/@MODULEDIR@/drmkms_agp/drmkms_agp.kmod.debug modules-obsolete obsolete
-./usr/libdata/debug/@MODULEDIR@/drmkms_linux modules-obsolete obsolete
-./usr/libdata/debug/@MODULEDIR@/drmkms_linux/drmkms_linux.kmod.debug modules-obsolete obsolete
-./usr/libdata/debug/@MODULEDIR@/drmkms_pci modules-obsolete obsolete
-./usr/libdata/debug/@MODULEDIR@/drmkms_pci/drmkms_pci.kmod.debug modules-obsolete obsolete
+./usr/libdata/debug/@MODULEDIR@/drmkms modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms/drmkms.kmod.debug modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms_agp modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms_agp/drmkms_agp.kmod.debug modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms_linux modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms_linux/drmkms_linux.kmod.debug modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms_pci modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms_pci/drmkms_pci.kmod.debug modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms_sched modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms_sched/drmkms_sched.kmod.debug modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms_ttm modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/drmkms_ttm/drmkms_ttm.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/dtrace_syscall_linux modules-base-kernel kmod,dtrace,debug
./usr/libdata/debug/@MODULEDIR@/dtrace_syscall_linux/dtrace_syscall_linux.kmod.debug modules-base-kernel kmod,dtrace,debug
./usr/libdata/debug/@MODULEDIR@/emdtv modules-base-kernel kmod,debug
@@ -101,8 +105,8 @@
./usr/libdata/debug/@MODULEDIR@/hpqlb/hpqlb.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/i915drm modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/i915drm/i915drm.kmod.debug modules-base-kernel kmod,debug
-./usr/libdata/debug/@MODULEDIR@/i915drmkms modules-obsolete obsolete
-./usr/libdata/debug/@MODULEDIR@/i915drmkms/i915drmkms.kmod.debug modules-obsolete obsolete
+./usr/libdata/debug/@MODULEDIR@/i915drmkms modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/i915drmkms/i915drmkms.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/ichsmb modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/ichsmb/ichsmb.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/if_iavf modules-base-kernel kmod,debug
Index: src/distrib/sets/lists/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.94 src/distrib/sets/lists/modules/md.amd64:1.95
--- src/distrib/sets/lists/modules/md.amd64:1.94 Wed Jul 27 18:29:35 2022
+++ src/distrib/sets/lists/modules/md.amd64 Thu Jul 28 22:00:23 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.94 2022/07/27 18:29:35 maya Exp $
+# $NetBSD: md.amd64,v 1.95 2022/07/28 22:00:23 riastradh Exp $
#
./@MODULEDIR@/acpiacad modules-base-kernel kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod modules-base-kernel kmod
@@ -114,14 +114,18 @@
./@MODULEDIR@/cxdtv/cxdtv.kmod modules-base-kernel kmod
./@MODULEDIR@/drm modules-base-kernel kmod
./@MODULEDIR@/drm/drm.kmod modules-base-kernel kmod
-./@MODULEDIR@/drmkms modules-obsolete obsolete
-./@MODULEDIR@/drmkms/drmkms.kmod modules-obsolete obsolete
-./@MODULEDIR@/drmkms_agp modules-obsolete obsolete
-./@MODULEDIR@/drmkms_agp/drmkms_agp.kmod modules-obsolete obsolete
-./@MODULEDIR@/drmkms_linux modules-obsolete obsolete
-./@MODULEDIR@/drmkms_linux/drmkms_linux.kmod modules-obsolete obsolete
-./@MODULEDIR@/drmkms_pci modules-obsolete obsolete
-./@MODULEDIR@/drmkms_pci/drmkms_pci.kmod modules-obsolete obsolete
+./@MODULEDIR@/drmkms modules-base-kernel kmod
+./@MODULEDIR@/drmkms/drmkms.kmod modules-base-kernel kmod
+./@MODULEDIR@/drmkms_agp modules-base-kernel kmod
+./@MODULEDIR@/drmkms_agp/drmkms_agp.kmod modules-base-kernel kmod
+./@MODULEDIR@/drmkms_linux modules-base-kernel kmod
+./@MODULEDIR@/drmkms_linux/drmkms_linux.kmod modules-base-kernel kmod
+./@MODULEDIR@/drmkms_pci modules-base-kernel kmod
+./@MODULEDIR@/drmkms_pci/drmkms_pci.kmod modules-base-kernel kmod
+./@MODULEDIR@/drmkms_sched modules-base-kernel kmod
+./@MODULEDIR@/drmkms_sched/drmkms_sched.kmod modules-base-kernel kmod
+./@MODULEDIR@/drmkms_ttm modules-base-kernel kmod
+./@MODULEDIR@/drmkms_ttm/drmkms_ttm.kmod modules-base-kernel kmod
./@MODULEDIR@/dtrace_syscall_linux modules-base-kernel kmod,dtrace
./@MODULEDIR@/dtrace_syscall_linux/dtrace_syscall_linux.kmod modules-base-kernel kmod,dtrace
./@MODULEDIR@/dtrace_syscall_linux32 modules-base-kernel kmod,dtrace
Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.92 src/distrib/sets/lists/modules/md.i386:1.93
--- src/distrib/sets/lists/modules/md.i386:1.92 Wed Jul 27 18:29:35 2022
+++ src/distrib/sets/lists/modules/md.i386 Thu Jul 28 22:00:23 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.92 2022/07/27 18:29:35 maya Exp $
+# $NetBSD: md.i386,v 1.93 2022/07/28 22:00:23 riastradh Exp $
#
./@MODULEDIR@/acpiacad modules-base-kernel kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod modules-base-kernel kmod
@@ -70,14 +70,18 @@
./@MODULEDIR@/cxdtv/cxdtv.kmod modules-base-kernel kmod
./@MODULEDIR@/drm modules-base-kernel kmod
./@MODULEDIR@/drm/drm.kmod modules-base-kernel kmod
-./@MODULEDIR@/drmkms modules-obsolete obsolete
-./@MODULEDIR@/drmkms/drmkms.kmod modules-obsolete obsolete
-./@MODULEDIR@/drmkms_agp modules-obsolete obsolete
-./@MODULEDIR@/drmkms_agp/drmkms_agp.kmod modules-obsolete obsolete
-./@MODULEDIR@/drmkms_linux modules-obsolete obsolete
-./@MODULEDIR@/drmkms_linux/drmkms_linux.kmod modules-obsolete obsolete
-./@MODULEDIR@/drmkms_pci modules-obsolete obsolete
-./@MODULEDIR@/drmkms_pci/drmkms_pci.kmod modules-obsolete obsolete
+./@MODULEDIR@/drmkms modules-base-kernel kmod
+./@MODULEDIR@/drmkms/drmkms.kmod modules-base-kernel kmod
+./@MODULEDIR@/drmkms_agp modules-base-kernel kmod
+./@MODULEDIR@/drmkms_agp/drmkms_agp.kmod modules-base-kernel kmod
+./@MODULEDIR@/drmkms_linux modules-base-kernel kmod
+./@MODULEDIR@/drmkms_linux/drmkms_linux.kmod modules-base-kernel kmod
+./@MODULEDIR@/drmkms_pci modules-base-kernel kmod
+./@MODULEDIR@/drmkms_pci/drmkms_pci.kmod modules-base-kernel kmod
+./@MODULEDIR@/drmkms_sched modules-base-kernel kmod
+./@MODULEDIR@/drmkms_sched/drmkms_sched.kmod modules-base-kernel kmod
+./@MODULEDIR@/drmkms_ttm modules-base-kernel kmod
+./@MODULEDIR@/drmkms_ttm/drmkms_ttm.kmod modules-base-kernel kmod
./@MODULEDIR@/dtrace_syscall_linux modules-base-kernel kmod,dtrace
./@MODULEDIR@/dtrace_syscall_linux/dtrace_syscall_linux.kmod modules-base-kernel kmod,dtrace
./@MODULEDIR@/emdtv modules-base-kernel kmod
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.268 src/sys/modules/Makefile:1.269
--- src/sys/modules/Makefile:1.268 Wed Jul 27 18:29:35 2022
+++ src/sys/modules/Makefile Thu Jul 28 22:00:23 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.268 2022/07/27 18:29:35 maya Exp $
+# $NetBSD: Makefile,v 1.269 2022/07/28 22:00:23 riastradh Exp $
.include <bsd.own.mk>
@@ -348,16 +348,17 @@ SUBDIR+= viadrmums
.if ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "x86_64"
+SUBDIR+= amdgpu
SUBDIR+= compat_linux
SUBDIR+= drm
-#SUBDIR+= drmkms
-#SUBDIR+= drmkms_agp
-#SUBDIR+= drmkms_linux
-#SUBDIR+= drmkms_pci
-#SUBDIR+= drmkms_ttm
+SUBDIR+= drmkms
+SUBDIR+= drmkms_agp
+SUBDIR+= drmkms_linux
+SUBDIR+= drmkms_pci
+SUBDIR+= drmkms_sched
+SUBDIR+= drmkms_ttm
SUBDIR+= i915drm
-SUBDIR+= amdgpu
-#SUBDIR+= i915drmkms
+SUBDIR+= i915drmkms
#
# ISA modules
#
