Module Name: src
Committed By: maya
Date: Wed Jul 27 18:29:35 UTC 2022
Modified Files:
src/distrib/sets/lists/modules: md.amd64 md.i386
src/share/mk: bsd.own.mk
src/sys/modules: Makefile
Log Message:
Enable amdgpu module & firmware on x86
Make it easier to test this one out, add `load amdgpu` before boot netbsd.
XXX there should probably be a drm block in sys/modules/Makefile which
includes aarch64.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.1286 -r1.1287 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.267 -r1.268 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/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.93 src/distrib/sets/lists/modules/md.amd64:1.94
--- src/distrib/sets/lists/modules/md.amd64:1.93 Sat Sep 25 17:55:37 2021
+++ src/distrib/sets/lists/modules/md.amd64 Wed Jul 27 18:29:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.93 2021/09/25 17:55:37 maya Exp $
+# $NetBSD: md.amd64,v 1.94 2022/07/27 18:29:35 maya Exp $
#
./@MODULEDIR@/acpiacad modules-base-kernel kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod modules-base-kernel kmod
@@ -28,6 +28,8 @@
./@MODULEDIR@/acpiwmi/acpiwmi.kmod modules-base-kernel kmod
./@MODULEDIR@/aibs modules-base-kernel kmod
./@MODULEDIR@/aibs/aibs.kmod modules-base-kernel kmod
+./@MODULEDIR@/amdgpu modules-base-kernel kmod
+./@MODULEDIR@/amdgpu/amdgpu.kmod modules-base-kernel kmod
./@MODULEDIR@/amdsmn modules-base-kernel kmod
./@MODULEDIR@/amdsmn/amdsmn.kmod modules-base-kernel kmod
./@MODULEDIR@/amdtemp modules-base-kernel kmod
Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.91 src/distrib/sets/lists/modules/md.i386:1.92
--- src/distrib/sets/lists/modules/md.i386:1.91 Sat Sep 25 17:55:37 2021
+++ src/distrib/sets/lists/modules/md.i386 Wed Jul 27 18:29:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.91 2021/09/25 17:55:37 maya Exp $
+# $NetBSD: md.i386,v 1.92 2022/07/27 18:29:35 maya Exp $
#
./@MODULEDIR@/acpiacad modules-base-kernel kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod modules-base-kernel kmod
@@ -28,6 +28,8 @@
./@MODULEDIR@/acpiwmi/acpiwmi.kmod modules-base-kernel kmod
./@MODULEDIR@/aibs modules-base-kernel kmod
./@MODULEDIR@/aibs/aibs.kmod modules-base-kernel kmod
+./@MODULEDIR@/amdgpu modules-base-kernel kmod
+./@MODULEDIR@/amdgpu/amdgpu.kmod modules-base-kernel kmod
./@MODULEDIR@/amdsmn modules-base-kernel kmod
./@MODULEDIR@/amdsmn/amdsmn.kmod modules-base-kernel kmod
./@MODULEDIR@/amdtemp modules-base-kernel kmod
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1286 src/share/mk/bsd.own.mk:1.1287
--- src/share/mk/bsd.own.mk:1.1286 Thu Jul 14 03:48:49 2022
+++ src/share/mk/bsd.own.mk Wed Jul 27 18:29:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1286 2022/07/14 03:48:49 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1287 2022/07/27 18:29:35 maya Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1249,6 +1249,8 @@ MKNOUVEAUFIRMWARE.aarch64= yes
MKRADEONFIRMWARE.x86_64= yes
MKRADEONFIRMWARE.i386= yes
MKRADEONFIRMWARE.aarch64= yes
+MKAMDGPUFIRMWARE.x86_64= yes
+MKAMDGPUFIRMWARE.i386= yes
# Only install the tegra firmware on evbarm.
MKTEGRAFIRMWARE.evbarm= yes
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.267 src/sys/modules/Makefile:1.268
--- src/sys/modules/Makefile:1.267 Sun Jul 17 15:36:05 2022
+++ src/sys/modules/Makefile Wed Jul 27 18:29:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.267 2022/07/17 15:36:05 riastradh Exp $
+# $NetBSD: Makefile,v 1.268 2022/07/27 18:29:35 maya Exp $
.include <bsd.own.mk>
@@ -356,6 +356,7 @@ SUBDIR+= drm
#SUBDIR+= drmkms_pci
#SUBDIR+= drmkms_ttm
SUBDIR+= i915drm
+SUBDIR+= amdgpu
#SUBDIR+= i915drmkms
#
# ISA modules
