? build-kernel.log
? build-kernel_w_patch.log
? build.log
? install-patched.log
? install.log
? install2.log
? yo!
? sys/arch/amd64/conf/GENERIC.sav
Index: sys/arch/amd64/conf/GENERIC
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/conf/GENERIC,v
retrieving revision 1.612
diff -u -r1.612 GENERIC
--- sys/arch/amd64/conf/GENERIC	30 Apr 2024 19:35:29 -0000	1.612
+++ sys/arch/amd64/conf/GENERIC	7 Jun 2024 22:46:36 -0000
@@ -461,17 +461,17 @@
 #tdfxdrm*	at drm?		# 3dfx (voodoo) DRM driver
 
 # DRMKMS drivers
-i915drmkms*	at pci? dev ? function ?
-intelfb*	at intelfbbus?
+#i915drmkms*	at pci? dev ? function ?
+#intelfb*	at intelfbbus?
 
-radeon* 	at pci? dev ? function ?
-radeondrmkmsfb* at radeonfbbus?
+#radeon* 	at pci? dev ? function ?
+#radeondrmkmsfb* at radeonfbbus?
 
-#amdgpu*	at pci? dev ? function ?
-#amdgpufb*	at amdgpufbbus?
+amdgpu*	at pci? dev ? function ?
+amdgpufb*	at amdgpufbbus?
 
-nouveau*	at pci? dev ? function ?
-nouveaufb*	at nouveaufbbus?
+#nouveau*	at pci? dev ? function ?
+#nouveaufb*	at nouveaufbbus?
 
 # DRMUMS drivers -- make them loadable, but not statically linked in
 options 	DRM_LEGACY
Index: sys/external/bsd/drm2/amdgpu/files.amdgpu
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm2/amdgpu/files.amdgpu,v
retrieving revision 1.31
diff -u -r1.31 files.amdgpu
--- sys/external/bsd/drm2/amdgpu/files.amdgpu	16 Apr 2024 14:34:01 -0000	1.31
+++ sys/external/bsd/drm2/amdgpu/files.amdgpu	7 Jun 2024 22:46:38 -0000
@@ -32,6 +32,8 @@
 makeoptions	amdgpu	"CPPFLAGS.amdgpu"+="-I$S/external/bsd/drm2/dist/drm/amd/display/amdgpu_dm"
 makeoptions	amdgpu	"CPPFLAGS.amdgpu"+="-I$S/external/bsd/drm2/dist/drm/amd/display/dmub/inc"
 
+makeoptions	amdgpu	"CPPFLAGS.amdgpu"+="-DCONFIG_ACPI=1"
+makeoptions	amdgpu	"CPPFLAGS.amdgpu"+="-DNACPICA=1"
 makeoptions	amdgpu	"CPPFLAGS.amdgpu"+="-DCONFIG_DRM_AMD_ACP=1"
 makeoptions	amdgpu	"CPPFLAGS.amdgpu"+="-DCONFIG_DRM_AMD_DC=1"
 makeoptions	amdgpu	"CPPFLAGS.amdgpu"+="-DCONFIG_DRM_AMD_DC_DCN=1"
Index: sys/modules/amdgpu/Makefile
===================================================================
RCS file: /cvsroot/src/sys/modules/amdgpu/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- sys/modules/amdgpu/Makefile	16 Apr 2024 14:34:03 -0000	1.9
+++ sys/modules/amdgpu/Makefile	7 Jun 2024 22:46:40 -0000
@@ -17,6 +17,7 @@
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
 	${MACHINE_CPU} == "arm" || ${MACHINE_CPU} == "aarch64"
+CPPFLAGS+=	-DCONFIG_ACPI=1
 CPPFLAGS+=	-DNACPICA=1
 .endif