summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaya <maya@NetBSD.org>2022-07-27 18:29:35 +0000
committermaya <maya@NetBSD.org>2022-07-27 18:29:35 +0000
commit85ded9c078263e2ef7ea2cb05250bc73d26ea565 (patch)
tree4f5bbb040005bb6981b301eb67cb5a8fc88c2df8
parent50fba5fee58ba97153cf7525585a0a68d7919ca7 (diff)
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.
-rw-r--r--distrib/sets/lists/modules/md.amd644
-rw-r--r--distrib/sets/lists/modules/md.i3864
-rw-r--r--share/mk/bsd.own.mk4
-rw-r--r--sys/modules/Makefile3
4 files changed, 11 insertions, 4 deletions
diff --git a/distrib/sets/lists/modules/md.amd64 b/distrib/sets/lists/modules/md.amd64
index 02b9b8cd072..f875863d51e 100644
--- a/distrib/sets/lists/modules/md.amd64
+++ b/distrib/sets/lists/modules/md.amd64
@@ -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
diff --git a/distrib/sets/lists/modules/md.i386 b/distrib/sets/lists/modules/md.i386
index 68a7b3fdf1a..b65810ec20c 100644
--- a/distrib/sets/lists/modules/md.i386
+++ b/distrib/sets/lists/modules/md.i386
@@ -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
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index d6d61344bc6..63cbba9ce9f 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -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
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 6413f511d4a..4f394b252f6 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -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