[src/trunk]: src/sys/external/bsd/drm2/drm Rerun drm2netbsd and merge.

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

details:   https://anonhg.NetBSD.org/src/rev/974ca1cdd89c
branches:  trunk
changeset: 1028337:974ca1cdd89c
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 10:39:57 2021 +0000

description:
Rerun drm2netbsd and merge.

New tag drmums for the legacy stuff; to deal with later for via.

diffstat:

 sys/external/bsd/drm2/drm/files.drmkms |  39 ++++++++++++++++++---------------
 1 files changed, 21 insertions(+), 18 deletions(-)

diffs (97 lines):

diff -r 052dd2934df9 -r 974ca1cdd89c sys/external/bsd/drm2/drm/files.drmkms
--- a/sys/external/bsd/drm2/drm/files.drmkms    Sun Dec 19 10:39:49 2021 +0000
+++ b/sys/external/bsd/drm2/drm/files.drmkms    Sun Dec 19 10:39:57 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.drmkms,v 1.57 2021/12/19 10:32:47 riastradh Exp $
+#      $NetBSD: files.drmkms,v 1.58 2021/12/19 10:39:57 riastradh Exp $
 
 version        20180827
 
@@ -55,19 +55,10 @@
 # NetBSD additions.
 file   external/bsd/drm2/drm/drm_agp_hook.c            drmkms
 file   external/bsd/drm2/drm/drm_cdevsw.c              drmkms
-file   external/bsd/drm2/drm/drm_gem_cma_helper.c      drmkms
 file   external/bsd/drm2/drm/drm_gem_vm.c              drmkms
 file   external/bsd/drm2/drm/drm_module.c              drmkms
+file   external/bsd/drm2/drm/drm_stub.c                !drmkms & !drmbase
 file   external/bsd/drm2/drm/drm_sysctl.c              drmkms
-file   external/bsd/drm2/drm/drm_cache.c       drmkms
-file   external/bsd/drm2/drm/drm_file.c        drmkms
-file   external/bsd/drm2/drm/drm_gem_framebuffer_helper.c      drmkms
-file   external/bsd/drm2/drm/drm_scatter.c     drmkms
-file   external/bsd/drm2/drm/drm_stub.c        !drmkms & !drmbase
-file   external/bsd/drm2/drm/drm_sysfs.c       drmkms
-file   external/bsd/drm2/drm/drm_vm.c  drmkms
-file   external/bsd/drm2/drm/drm_vma_manager.c drmkms
-file   external/bsd/drm2/i2c/drm_encoder_slave.c       drmkms
 
 # Generic, unaccelerated kms framebuffer.
 define drmfb: genfb
@@ -87,6 +78,16 @@
 makeoptions    drmkms  "CWARNFLAGS.drm_ioctl.c"+="-Wno-shadow"
 makeoptions    drmkms  "CWARNFLAGS.drm_modes.c"+="-Wno-shadow"
 
+# Legacy user-mode setting
+define drmums: drmkms
+makeoptions    drmums  CPPFLAGS+="-DCONFIG_DRM_LEGACY"
+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
+file   external/bsd/drm2/dist/drm/drm_legacy_misc.c    drmums
+file   external/bsd/drm2/dist/drm/drm_lock.c           drmums
+file   external/bsd/drm2/drm/drm_scatter.c             drmums
+
 # Generated from drm2netbsd.
 #file  external/bsd/drm2/dist/drm/drm_agpsupport.c     drmkms  # drmkms_pci
 file   external/bsd/drm2/dist/drm/drm_atomic.c drmkms
@@ -96,7 +97,7 @@
 file   external/bsd/drm2/dist/drm/drm_auth.c   drmkms
 file   external/bsd/drm2/dist/drm/drm_blend.c  drmkms
 file   external/bsd/drm2/dist/drm/drm_bridge.c drmkms
-#file  external/bsd/drm2/dist/drm/drm_cache.c  drmkms
+file   external/bsd/drm2/drm/drm_cache.c       drmkms
 #file  external/bsd/drm2/dist/drm/drm_client.c drmkms
 file   external/bsd/drm2/dist/drm/drm_client_modeset.c drmkms
 file   external/bsd/drm2/dist/drm/drm_color_mgmt.c     drmkms
@@ -112,15 +113,16 @@
 file   external/bsd/drm2/dist/drm/drm_dumb_buffers.c   drmkms
 file   external/bsd/drm2/dist/drm/drm_edid.c   drmkms
 file   external/bsd/drm2/dist/drm/drm_encoder.c        drmkms
-#file  external/bsd/drm2/dist/drm/drm_encoder_slave.c  drmkms
+file   external/bsd/drm2/i2c/drm_encoder_slave.c       drmkms
 file   external/bsd/drm2/dist/drm/drm_fb_helper.c      drmkms
-#file  external/bsd/drm2/dist/drm/drm_file.c   drmkms
+file   external/bsd/drm2/drm/drm_file.c        drmkms
 file   external/bsd/drm2/dist/drm/drm_flip_work.c      drmkms
 #file  external/bsd/drm2/dist/drm/drm_format_helper.c  drmkms
 file   external/bsd/drm2/dist/drm/drm_fourcc.c drmkms
 file   external/bsd/drm2/dist/drm/drm_framebuffer.c    drmkms
 file   external/bsd/drm2/dist/drm/drm_gem.c    drmkms
-#file  external/bsd/drm2/dist/drm/drm_gem_framebuffer_helper.c drmkms
+file   external/bsd/drm2/drm/drm_gem_cma_helper.c      drmkms
+file   external/bsd/drm2/drm/drm_gem_framebuffer_helper.c      drmkms
 file   external/bsd/drm2/dist/drm/drm_hashtab.c        drmkms
 #file  external/bsd/drm2/dist/drm/drm_hdcp.c   drmkms
 file   external/bsd/drm2/dist/drm/drm_ioctl.c  drmkms
@@ -134,6 +136,7 @@
 file   external/bsd/drm2/dist/drm/drm_modes.c  drmkms
 file   external/bsd/drm2/dist/drm/drm_modeset_helper.c drmkms
 file   external/bsd/drm2/dist/drm/drm_modeset_lock.c   drmkms
+file   external/bsd/drm2/dist/drm/drm_panel.c  drmkms
 #file  external/bsd/drm2/dist/drm/drm_pci.c    drmkms  # drmkms_pci
 file   external/bsd/drm2/dist/drm/drm_plane.c  drmkms
 file   external/bsd/drm2/dist/drm/drm_plane_helper.c   drmkms
@@ -146,9 +149,9 @@
 file   external/bsd/drm2/dist/drm/drm_self_refresh_helper.c    drmkms
 #file  external/bsd/drm2/dist/drm/drm_simple_kms_helper.c      drmkms
 file   external/bsd/drm2/dist/drm/drm_syncobj.c        drmkms
-#file  external/bsd/drm2/dist/drm/drm_sysfs.c  drmkms
+file   external/bsd/drm2/drm/drm_sysfs.c       drmkms
 file   external/bsd/drm2/dist/drm/drm_trace_points.c   drmkms
 file   external/bsd/drm2/dist/drm/drm_vblank.c drmkms
-#file  external/bsd/drm2/dist/drm/drm_vm.c     drmkms
-#file  external/bsd/drm2/dist/drm/drm_vma_manager.c    drmkms
+file   external/bsd/drm2/drm/drm_vm.c  drmkms
+file   external/bsd/drm2/drm/drm_vma_manager.c drmkms
 #file  external/bsd/drm2/dist/drm/drm_writeback.c      drmkms