Module Name: src
Committed By: martin
Date: Wed Aug 2 10:28:08 UTC 2023
Modified Files:
src/sys/external/bsd/drm2/amdgpu [netbsd-10]: files.amdgpu
src/sys/modules/amdgpu [netbsd-10]: Makefile
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #302):
sys/modules/amdgpu/Makefile: revision 1.6
sys/external/bsd/drm2/amdgpu/files.amdgpu: revision 1.30
amdgpu: Define CONFIG_DRM_AMD_DC to enable display core logic.
Probably resolves a host of issues with amdgpu not detecting
displays!
Noticed by rjs@.
PR kern/57059
PR kern/57325
PR kern/57452
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.4.1 src/sys/external/bsd/drm2/amdgpu/files.amdgpu
cvs rdiff -u -r1.5 -r1.5.4.1 src/sys/modules/amdgpu/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/amdgpu/files.amdgpu
diff -u src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.29 src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.29.4.1
--- src/sys/external/bsd/drm2/amdgpu/files.amdgpu:1.29 Sun Jul 24 20:05:00 2022
+++ src/sys/external/bsd/drm2/amdgpu/files.amdgpu Wed Aug 2 10:28:08 2023
@@ -1,4 +1,4 @@
-# $NetBSD: files.amdgpu,v 1.29 2022/07/24 20:05:00 riastradh Exp $
+# $NetBSD: files.amdgpu,v 1.29.4.1 2023/08/02 10:28:08 martin Exp $
version 20180827
@@ -33,6 +33,7 @@ makeoptions amdgpu "CPPFLAGS.amdgpu"+="-
makeoptions amdgpu "CPPFLAGS.amdgpu"+="-I$S/external/bsd/drm2/dist/drm/amd/display/dmub/inc"
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"
makeoptions amdgpu "CPPFLAGS.amdgpu"+="-DCONFIG_DRM_AMD_DC_HDCP=1"
makeoptions amdgpu "CPPFLAGS.amdgpu"+="-DCONFIG_PERF_EVENTS=0"
Index: src/sys/modules/amdgpu/Makefile
diff -u src/sys/modules/amdgpu/Makefile:1.5 src/sys/modules/amdgpu/Makefile:1.5.4.1
--- src/sys/modules/amdgpu/Makefile:1.5 Sat Jul 30 03:29:52 2022
+++ src/sys/modules/amdgpu/Makefile Wed Aug 2 10:28:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/07/30 03:29:52 tnn Exp $
+# $NetBSD: Makefile,v 1.5.4.1 2023/08/02 10:28:07 martin Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -35,6 +35,7 @@ CPPFLAGS+= -I${S}/external/bsd/drm2/dist
CPPFLAGS+= -I${S}/external/bsd/drm2/dist/drm/amd/display/amdgpu_dm
CPPFLAGS+= -I${S}/external/bsd/drm2/dist/drm/amd/display/dmub/inc
CPPFLAGS+= -DCONFIG_DRM_AMD_ACP=1
+CPPFLAGS+= -DCONFIG_DRM_AMD_DC=1
CPPFLAGS+= -DCONFIG_DRM_AMD_DC_DCN=1
CPPFLAGS+= -DCONFIG_DRM_AMD_DC_HDCP=1
CPPFLAGS+= -DCONFIG_PERF_EVENTS=0
