[src/trunk]: src/sys/external/bsd/drm2 drm: Propagate CPPFLAGS.drmkms into al...

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

details:   https://anonhg.NetBSD.org/src/rev/bb5bd29b225b
branches:  trunk
changeset: 368569:bb5bd29b225b
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Tue Jul 19 23:19:06 2022 +0000

description:
drm: Propagate CPPFLAGS.drmkms into all the drm drivers.

diffstat:

 sys/external/bsd/drm2/amdgpu/files.amdgpu      |  3 ++-
 sys/external/bsd/drm2/drm/files.drmkms         |  7 +++++--
 sys/external/bsd/drm2/i915drm/files.i915drmkms |  3 ++-
 sys/external/bsd/drm2/nouveau/files.nouveau    |  3 ++-
 sys/external/bsd/drm2/pci/files.drmkms_pci     |  6 +++++-
 sys/external/bsd/drm2/radeon/files.radeon      |  4 +++-
 sys/external/bsd/drm2/ttm/files.ttm            |  3 ++-
 sys/external/bsd/drm2/via/files.via            |  3 ++-
 sys/external/bsd/drm2/vmwgfx/files.vmwgfx      |  3 ++-
 9 files changed, 25 insertions(+), 10 deletions(-)

diffs (161 lines):

diff -r d7d0ef425437 -r bb5bd29b225b sys/external/bsd/drm2/amdgpu/files.amdgpu
--- a/sys/external/bsd/drm2/amdgpu/files.amdgpu Tue Jul 19 22:24:47 2022 +0000
+++ b/sys/external/bsd/drm2/amdgpu/files.amdgpu Tue Jul 19 23:19:06 2022 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: files.amdgpu,v 1.26 2021/12/19 12:39:48 riastradh Exp $
+#      $NetBSD: files.amdgpu,v 1.27 2022/07/19 23:19:06 riastradh Exp $
 
 version        20180827
 
 define amdgpufbbus     { }
 device amdgpu: drmkms, drmkms_pci, drmkms_ttm, amdgpufbbus, firmload
 attach amdgpu at pci
+makeoptions    amdgpu          "CPPFLAGS.amdgpu"+="${CPPFLAGS.drmkms}"
 
 defflag        opt_amdgpu_cik.h AMDGPU_CIK
 
diff -r d7d0ef425437 -r bb5bd29b225b sys/external/bsd/drm2/drm/files.drmkms
--- a/sys/external/bsd/drm2/drm/files.drmkms    Tue Jul 19 22:24:47 2022 +0000
+++ b/sys/external/bsd/drm2/drm/files.drmkms    Tue Jul 19 23:19:06 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.drmkms,v 1.74 2022/07/19 22:24:47 riastradh Exp $
+#      $NetBSD: files.drmkms,v 1.75 2022/07/19 23:19:06 riastradh Exp $
 
 version        20180827
 
@@ -67,6 +67,8 @@
 define drmfb: genfb
 file   external/bsd/drm2/drm/drmfb.c                   drmfb
 
+makeoptions    drmfb   "CPPFLAGS.drmfb"+="${CPPFLAGS.drmkms}"
+
 include "external/bsd/drm2/ttm/files.ttm"
 
 makeoptions    drmkms  "CWARNFLAGS.drm_atomic_helper.c"+="-Wno-shadow"
@@ -84,7 +86,8 @@
 
 # Legacy user-mode setting
 define drmums: drmkms
-makeoptions    drmums  CPPFLAGS+="-DCONFIG_DRM_LEGACY"
+makeoptions    drmums  "CPPFLAGS.drmkms"+="-DCONFIG_DRM_LEGACY"
+makeoptions    drmums  "CPPFLAGS.drmums"+="${CPPFLAGS.drmkms}"
 file   external/bsd/drm2/dist/drm/drm_bufs.c           drmums
 file   external/bsd/drm2/dist/drm/drm_context.c        drmums
 file   external/bsd/drm2/dist/drm/drm_dma.c            drmums
diff -r d7d0ef425437 -r bb5bd29b225b sys/external/bsd/drm2/i915drm/files.i915drmkms
--- a/sys/external/bsd/drm2/i915drm/files.i915drmkms    Tue Jul 19 22:24:47 2022 +0000
+++ b/sys/external/bsd/drm2/i915drm/files.i915drmkms    Tue Jul 19 23:19:06 2022 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: files.i915drmkms,v 1.87 2022/07/17 14:10:32 riastradh Exp $
+#      $NetBSD: files.i915drmkms,v 1.88 2022/07/19 23:19:06 riastradh Exp $
 
 version        20180827
 
 define intelfbbus      { }
 device i915drmkms: acpivga, drmkms, drmkms_pci, intelfbbus, agp_i810, firmload
 attach i915drmkms at pci
+makeoptions    i915drmkms      "CPPFLAGS.i915drmkms"+="${CPPFLAGS.drmkms}"
 
 device intelfb: intelfbbus, drmfb, drmfb_pci, wsemuldisplaydev
 attach intelfb at intelfbbus
diff -r d7d0ef425437 -r bb5bd29b225b sys/external/bsd/drm2/nouveau/files.nouveau
--- a/sys/external/bsd/drm2/nouveau/files.nouveau       Tue Jul 19 22:24:47 2022 +0000
+++ b/sys/external/bsd/drm2/nouveau/files.nouveau       Tue Jul 19 23:19:06 2022 +0000
@@ -1,9 +1,10 @@
-#      $NetBSD: files.nouveau,v 1.37 2021/12/21 12:55:24 tnn Exp $
+#      $NetBSD: files.nouveau,v 1.38 2022/07/19 23:19:07 riastradh Exp $
 
 version        20180827
 
 define nouveaufbbus    { }
 device nouveau: drmkms, drmkms_ttm, nouveaufbbus, firmload
+makeoptions    nouveau         "CPPFLAGS.nouveau"+="${CPPFLAGS.drmkms}"
 
 attach nouveau at pci with nouveau_pci: drmkms_pci
 file   external/bsd/drm2/nouveau/nouveau_pci.c                 nouveau_pci
diff -r d7d0ef425437 -r bb5bd29b225b sys/external/bsd/drm2/pci/files.drmkms_pci
--- a/sys/external/bsd/drm2/pci/files.drmkms_pci        Tue Jul 19 22:24:47 2022 +0000
+++ b/sys/external/bsd/drm2/pci/files.drmkms_pci        Tue Jul 19 23:19:06 2022 +0000
@@ -1,7 +1,9 @@
-#      $NetBSD: files.drmkms_pci,v 1.16 2022/02/17 01:21:02 riastradh Exp $
+#      $NetBSD: files.drmkms_pci,v 1.17 2022/07/19 23:19:07 riastradh Exp $
 
 define drmkms_pci: drmkms
 
+makeoptions    drmkms_pci      "CPPFLAGS.drmkms_pci"+="${CPPFLAGS.drmkms}"
+
 #file  external/bsd/drm2/dist/drm/ati_pcigart.c        drmkms_pci
 file   external/bsd/drm2/dist/drm/drm_agpsupport.c     drmkms_pci & agp
 file   external/bsd/drm2/pci/drm_pci.c                 drmkms_pci
@@ -10,6 +12,8 @@
 define drmfb_pci: drmfb, drmkms_pci
 file   external/bsd/drm2/pci/drmfb_pci.c               drmfb_pci
 
+makeoptions    drmfb_pci       "CPPFLAGS.drmfb_pci"+="${CPPFLAGS.drmfb}"
+
 include "external/bsd/drm2/amdgpu/files.amdgpu"
 include "external/bsd/drm2/i915drm/files.i915drmkms"
 include "external/bsd/drm2/radeon/files.radeon"
diff -r d7d0ef425437 -r bb5bd29b225b sys/external/bsd/drm2/radeon/files.radeon
--- a/sys/external/bsd/drm2/radeon/files.radeon Tue Jul 19 22:24:47 2022 +0000
+++ b/sys/external/bsd/drm2/radeon/files.radeon Tue Jul 19 23:19:06 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.radeon,v 1.36 2021/12/21 13:56:58 tnn Exp $
+#      $NetBSD: files.radeon,v 1.37 2022/07/19 23:19:07 riastradh Exp $
 
 version        20180827
 
@@ -14,6 +14,8 @@
 # overflow is OK.
 makeoptions    radeon  "COPTS.radeon"+="-fwrapv"
 
+makeoptions    radeon  "CPPFLAGS.radeon"+="${CPPFLAGS.drmkms}"
+
 makeoptions    radeondrmkmsfb  "CPPFLAGS.radeondrmkmsfb"+="${CPPFLAGS.radeon}"
 
 # Our overrides first.
diff -r d7d0ef425437 -r bb5bd29b225b sys/external/bsd/drm2/ttm/files.ttm
--- a/sys/external/bsd/drm2/ttm/files.ttm       Tue Jul 19 22:24:47 2022 +0000
+++ b/sys/external/bsd/drm2/ttm/files.ttm       Tue Jul 19 23:19:06 2022 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: files.ttm,v 1.8 2022/07/17 15:36:05 riastradh Exp $
+#      $NetBSD: files.ttm,v 1.9 2022/07/19 23:19:07 riastradh Exp $
 
 # TTM, the texture and tiling manager.
 
 version        20180827
 
 define drmkms_ttm: drmkms
+makeoptions    drmkms_ttm      "CPPFLAGS.drmkms_ttm"+="${CPPFLAGS.drmkms}"
 
 makeoptions    drmkms  "CWARNFLAGS.ttm_bo.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 7:? -Wno-error=implicit-fallthrough :}"
 makeoptions    drmkms_ttm      "CPPFLAGS.drmkms_ttm"+="-DCONFIG_AGP=1"
diff -r d7d0ef425437 -r bb5bd29b225b sys/external/bsd/drm2/via/files.via
--- a/sys/external/bsd/drm2/via/files.via       Tue Jul 19 22:24:47 2022 +0000
+++ b/sys/external/bsd/drm2/via/files.via       Tue Jul 19 23:19:06 2022 +0000
@@ -1,7 +1,8 @@
-#      $NetBSD: files.via,v 1.5 2021/12/19 12:30:23 riastradh Exp $
+#      $NetBSD: files.via,v 1.6 2022/07/19 23:19:07 riastradh Exp $
 
 device viadrmums: drmkms, drmkms_pci, drmums
 attach viadrmums at drm
+makeoptions    viadrmums       "CPPFLAGS.viadrmums"+="${CPPFLAGS.drmums}"
 
 makeoptions    viadrmums       "CPPFLAGS.viadrmums"+="-I$S/external/bsd/drm2/dist/drm/via"
 makeoptions    viadrmums       "CPPFLAGS.viadrmums"+="-I$S/external/bsd/drm2/via"
diff -r d7d0ef425437 -r bb5bd29b225b sys/external/bsd/drm2/vmwgfx/files.vmwgfx
--- a/sys/external/bsd/drm2/vmwgfx/files.vmwgfx Tue Jul 19 22:24:47 2022 +0000
+++ b/sys/external/bsd/drm2/vmwgfx/files.vmwgfx Tue Jul 19 23:19:06 2022 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: files.vmwgfx,v 1.1 2022/02/17 01:21:03 riastradh Exp $
+#      $NetBSD: files.vmwgfx,v 1.2 2022/07/19 23:19:07 riastradh Exp $
 
 version        20180827
 
 define vmwgfxfbbus     { }
 device vmwgfx: drmkms, drmkms_pci, drmkms_ttm, vmwgfxfbbus
 attach vmwgfx at pci
+makeoptions    vmwgfx  "CPPFLAGS.vmwgfx"+="${CPPFLAGS.drmkms}"
 
 device vmwgfxfb: vmwgfxfbbus, drmfb, drmfb_pci, wsemuldisplaydev
 attach vmwgfxfb at vmwgfxfbbus