Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:54:25 UTC 2021
Modified Files:
src/sys/modules/drmkms: Makefile Makefile.inc
src/sys/modules/drmkms_linux: Makefile
src/sys/modules/drmkms_pci: Makefile
Log Message:
drm: Sync (device-independent) drmkms*.kmod makefiles.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/modules/drmkms/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/drmkms/Makefile.inc
cvs rdiff -u -r1.13 -r1.14 src/sys/modules/drmkms_linux/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/modules/drmkms_pci/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/modules/drmkms/Makefile
diff -u src/sys/modules/drmkms/Makefile:1.14 src/sys/modules/drmkms/Makefile:1.15
--- src/sys/modules/drmkms/Makefile:1.14 Thu Jun 3 15:59:04 2021
+++ src/sys/modules/drmkms/Makefile Sun Dec 19 11:54:24 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2021/06/03 15:59:04 nia Exp $
+# $NetBSD: Makefile,v 1.15 2021/12/19 11:54:24 riastradh Exp $
.include "../Makefile.inc"
.include "Makefile.inc"
@@ -15,11 +15,13 @@ MKLDSCRIPT=yes
# NetBSD additions.
SRCS+= drm_agp_hook.c
SRCS+= drm_cdevsw.c
-SRCS+= drm_gem_cma_helper.c
SRCS+= drm_gem_vm.c
+SRCS+= drm_hdcp.c
SRCS+= drm_module.c
SRCS+= drm_sysctl.c
+SRCS+= drm_pci_busid.c
+
# Generic, unaccelerated kms framebuffer.
SRCS+= drmfb.c
@@ -36,54 +38,82 @@ COPTS.drm_bufs.c+= -Wno-pointer-arith
COPTS.drm_crtc.c+= -Wno-missing-field-initializers
COPTS.drm_crtc.c+= -Wno-pointer-arith
COPTS.drm_crtc.c+= -Wno-shadow
+COPTS.drm_client_modeset.c+= -Wno-shadow
COPTS.drm_dp_helper.c+= -Wno-pointer-arith
+COPTS.drm_fb_helper.c+= -Wno-shadow
+COPTS.drm_edid.c+= -Wno-error=attributes
COPTS.drm_edid.c+= -Wno-shadow
COPTS.drm_ioctl.c+= -Wno-shadow
+COPTS.drm_modes.c+= -Wno-shadow
# Upstream source files.
-#SRCS+= ati_pcigart.c # Moved to drmkms_pci module.
#SRCS+= drm_agpsupport.c # Moved to drmkms_pci module.
SRCS+= drm_atomic.c
SRCS+= drm_atomic_helper.c
+SRCS+= drm_atomic_state_helper.c
+SRCS+= drm_atomic_uapi.c
SRCS+= drm_auth.c
+SRCS+= drm_blend.c
SRCS+= drm_bridge.c
-SRCS+= drm_bufs.c
SRCS+= drm_cache.c
-SRCS+= drm_context.c
+SRCS+= drm_client.c
+SRCS+= drm_client_modeset.c
+SRCS+= drm_color_mgmt.c
+SRCS+= drm_connector.c
SRCS+= drm_crtc.c
SRCS+= drm_crtc_helper.c
-SRCS+= drm_debugfs.c
-SRCS+= drm_dma.c
+SRCS+= drm_damage_helper.c
+SRCS+= drm_dp_dual_mode_helper.c
SRCS+= drm_dp_helper.c
SRCS+= drm_dp_mst_topology.c
SRCS+= drm_drv.c
+SRCS+= drm_dsc.c
+SRCS+= drm_dumb_buffers.c
SRCS+= drm_edid.c
+SRCS+= drm_encoder.c
SRCS+= drm_encoder_slave.c
SRCS+= drm_fb_helper.c
SRCS+= drm_flip_work.c
-SRCS+= drm_fops.c
+#SRCS+= drm_format_helper.c
+SRCS+= drm_fourcc.c
+SRCS+= drm_framebuffer.c
SRCS+= drm_gem.c
-SRCS+= drm_global.c
+SRCS+= drm_gem_cma_helper.c
+SRCS+= drm_gem_framebuffer_helper.c
SRCS+= drm_hashtab.c
-#SRCS+= drm_info.c # XXX Rewrite for sysctl or something.
+#SRCS+= drm_hdcp.c # Local override.
SRCS+= drm_ioctl.c
SRCS+= drm_irq.c
SRCS+= drm_lock.c
+#SRCS+= drm_kms_helper_common.c
+SRCS+= drm_lease.c
SRCS+= drm_memory.c
SRCS+= drm_mm.c
+SRCS+= drm_mode_config.c
+SRCS+= drm_mode_object.c
SRCS+= drm_modes.c
+SRCS+= drm_modeset_helper.c
SRCS+= drm_modeset_lock.c
+SRCS+= drm_panel.c
+SRCS+= drm_panel_orientation_quirks.c
#SRCS+= drm_pci.c # Moved to drmkms_pci module.
+SRCS+= drm_plane.c
SRCS+= drm_plane_helper.c
-#SRCS+= drm_platform.c # XXX Rewrite per platform.
-#SRCS+= drm_prime.c # XXX Revisit later.
+SRCS+= drm_prime.c
+SRCS+= drm_print.c
SRCS+= drm_probe_helper.c
+SRCS+= drm_property.c
SRCS+= drm_rect.c
-SRCS+= drm_scatter.c
+SRCS+= drm_scdc_helper.c
+SRCS+= drm_self_refresh_helper.c
+#SRCS+= drm_simple_kms_helper.c
+SRCS+= drm_syncobj.c
SRCS+= drm_sysfs.c
SRCS+= drm_trace_points.c
+SRCS+= drm_vblank.c
SRCS+= drm_vm.c
SRCS+= drm_vma_manager.c
+SRCS+= drm_writeback.c
WARNS= 3
Index: src/sys/modules/drmkms/Makefile.inc
diff -u src/sys/modules/drmkms/Makefile.inc:1.5 src/sys/modules/drmkms/Makefile.inc:1.6
--- src/sys/modules/drmkms/Makefile.inc:1.5 Mon Aug 27 13:53:42 2018
+++ src/sys/modules/drmkms/Makefile.inc Sun Dec 19 11:54:24 2021
@@ -1,33 +1,47 @@
-# $NetBSD: Makefile.inc,v 1.5 2018/08/27 13:53:42 riastradh Exp $
+# $NetBSD: Makefile.inc,v 1.6 2021/12/19 11:54:24 riastradh Exp $
# Common makefile cruft for drm2 code.
# XXX All the -D crap needs to go in a header file instead so changing
# it correctly triggers rebuilds.
+COPTS+= -fwrapv
+
# Overrides first.
CPPFLAGS+= -I${S}/external/bsd/drm2/include
+CPPFLAGS+= -I${S}/external/bsd/drm2/include/drm
CPPFLAGS+= -I${S}/external/bsd/common/include
# Then upstream.
CPPFLAGS+= -I${S}/external/bsd/drm2/dist/include
CPPFLAGS+= -I${S}/external/bsd/drm2/dist/include/drm
-CPPFLAGS+= -I${S}/external/bsd/drm2/dist/uapi
-
-# Must come last because some header file names are repeated in
-# dist/drm (I'm looking ta you, drm_legacy.h), while others sometimes
-# explicitly write <uapi/...>. (Maybe that should have been imported
-# under dist/include/uapi rather than dist/uapi.)
-CPPFLAGS+= -I${S}/external/bsd/drm2/dist
+CPPFLAGS+= -I${S}/external/bsd/drm2/dist/include/uapi
-# XXX Should probably be in a header file. opt_drmkms.h?
CPPFLAGS+= -D__KERNEL__
+.if ${MACHINE_ARCH} == "i386"
+CPPFLAGS+= -DCONFIG_X86
+CPPFLAGS+= -DCONFIG_X86_PAT
+.elif ${MACHINE_ARCH} == "x86_64"
+CPPFLAGS+= -DCONFIG_X86
+CPPFLAGS+= -DCONFIG_X86_64
+CPPFLAGS+= -DCONFIG_X86_PAT
+.elif ${MACHINE} == "evbarm"
+CPPFLAGS+= -DCONFIG_ARM
+.elif ${MACHINE_ARCH} == "aarch64"
+CPPFLAGS+= -DCONFIG_AARCH64
+.endif
+
CPPFLAGS+= -DCONFIG_BACKLIGHT_CLASS_DEVICE=0
CPPFLAGS+= -DCONFIG_BACKLIGHT_CLASS_DEVICE_MODULE=0
CPPFLAGS+= -DCONFIG_DRM_FBDEV_EMULATION=0
+CPPFLAGS+= -DCONFIG_DRM_FBDEV_OVERALLOC=1000
CPPFLAGS+= -DCONFIG_FB=0
+CPPFLAGS+= -DCONFIG_LOCKDEP=0
+CPPFLAGS+= -DCONFIG_PCI=1
+
+CWARNFLAGS+= -Wno-missing-field-initializers
# XXX Is this the right place to set this?
CPPFLAGS+= -DDIAGNOSTIC
Index: src/sys/modules/drmkms_linux/Makefile
diff -u src/sys/modules/drmkms_linux/Makefile:1.13 src/sys/modules/drmkms_linux/Makefile:1.14
--- src/sys/modules/drmkms_linux/Makefile:1.13 Sun Dec 19 00:27:09 2021
+++ src/sys/modules/drmkms_linux/Makefile Sun Dec 19 11:54:24 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/12/19 00:27:09 riastradh Exp $
+# $NetBSD: Makefile,v 1.14 2021/12/19 11:54:24 riastradh Exp $
#
# At some point this needs to turn into linux.kmod and a proper home for it
@@ -19,20 +19,40 @@ CPPFLAGS+= -DDIAGNOSTIC
KMOD= drmkms_linux
+# common/linux
+SRCS+= linux_rcu.c
+SRCS+= linux_srcu.c
+SRCS+= linux_tasklet.c
+SRCS+= linux_work.c
+
+# drm2/linux
SRCS+= linux_atomic64.c
+SRCS+= linux_backlight.c
SRCS+= linux_dma_buf.c
SRCS+= linux_dma_fence.c
+SRCS+= linux_dma_fence_array.c
+SRCS+= linux_dma_fence_chain.c
+SRCS+= linux_dma_resv.c
SRCS+= linux_dmi.c
+SRCS+= linux_firmware.c
+SRCS+= linux_hrtimer.c
SRCS+= linux_i2c.c
SRCS+= linux_idr.c
+SRCS+= linux_irq_work.c
SRCS+= linux_kmap.c
SRCS+= linux_list_sort.c
SRCS+= linux_module.c
-SRCS+= linux_rcu.c
-SRCS+= linux_reservation.c
-SRCS+= linux_work.c # XXX Move me to linux.kmod.
+SRCS+= linux_notifier.c
+SRCS+= linux_pci.c
+SRCS+= linux_radixtree.c
+SRCS+= linux_rwsem.c
+SRCS+= linux_sg.c
+SRCS+= linux_stop_machine.c
+SRCS+= linux_sync_file.c
+SRCS+= linux_wait_bit.c
SRCS+= linux_writecomb.c
SRCS+= linux_ww_mutex.c
+SRCS+= linux_xa.c
WARNS= 3
Index: src/sys/modules/drmkms_pci/Makefile
diff -u src/sys/modules/drmkms_pci/Makefile:1.9 src/sys/modules/drmkms_pci/Makefile:1.10
--- src/sys/modules/drmkms_pci/Makefile:1.9 Sun Feb 17 04:05:47 2019
+++ src/sys/modules/drmkms_pci/Makefile Sun Dec 19 11:54:25 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/02/17 04:05:47 rin Exp $
+# $NetBSD: Makefile,v 1.10 2021/12/19 11:54:25 riastradh Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -13,7 +13,6 @@ KMOD= drmkms_pci
SRCS+= drmfb_pci.c
SRCS+= linux_pci.c
-#SRCS+= ati_pcigart.c # XXX Restore for ATI support.
SRCS+= drm_agpsupport.c
SRCS+= drm_pci.c
SRCS+= drm_pci_module.c
