Module Name:    src
Committed By:   riastradh
Date:           Fri Jul 14 13:05:59 UTC 2023

Modified Files:
        src/sys/external/bsd/drm2/amdgpu: files.amdgpu
        src/sys/modules/amdgpu: Makefile

Log Message:
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

XXX pullup-10


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/external/bsd/drm2/amdgpu/files.amdgpu
cvs rdiff -u -r1.5 -r1.6 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.30
--- 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	Fri Jul 14 13:05:59 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: files.amdgpu,v 1.29 2022/07/24 20:05:00 riastradh Exp $
+#	$NetBSD: files.amdgpu,v 1.30 2023/07/14 13:05:59 riastradh 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.6
--- src/sys/modules/amdgpu/Makefile:1.5	Sat Jul 30 03:29:52 2022
+++ src/sys/modules/amdgpu/Makefile	Fri Jul 14 13:05:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/07/30 03:29:52 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2023/07/14 13:05:59 riastradh 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

Reply via email to