[src/trunk]: src/sys/modules/amdgpu amdgpu: Define CONFIG_DRM_AMD_DC to enabl...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2fe8729224fe
branches:  trunk
changeset: 377499:2fe8729224fe
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri Jul 14 13:05:59 2023 +0000

description:
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

diffstat:

 sys/external/bsd/drm2/amdgpu/files.amdgpu |  3 ++-
 sys/modules/amdgpu/Makefile               |  3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 5f647fb07834 -r 2fe8729224fe sys/external/bsd/drm2/amdgpu/files.amdgpu
--- a/sys/external/bsd/drm2/amdgpu/files.amdgpu Fri Jul 14 12:57:10 2023 +0000
+++ b/sys/external/bsd/drm2/amdgpu/files.amdgpu Fri Jul 14 13:05:59 2023 +0000
@@ -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"
diff -r 5f647fb07834 -r 2fe8729224fe sys/modules/amdgpu/Makefile
--- a/sys/modules/amdgpu/Makefile       Fri Jul 14 12:57:10 2023 +0000
+++ b/sys/modules/amdgpu/Makefile       Fri Jul 14 13:05:59 2023 +0000
@@ -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