[src/trunk]: src/sys/external/bsd/drm2/drm drm_fb_helper.c got lost in the me...

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

details:   https://anonhg.NetBSD.org/src/rev/014de219fe69
branches:  trunk
changeset: 835204:014de219fe69
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:54:28 2018 +0000

description:
drm_fb_helper.c got lost in the merge, restore it.

diffstat:

 sys/external/bsd/drm2/drm/drm2netbsd   |  3 ++-
 sys/external/bsd/drm2/drm/files.drmkms |  3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r f50f94c293e7 -r 014de219fe69 sys/external/bsd/drm2/drm/drm2netbsd
--- a/sys/external/bsd/drm2/drm/drm2netbsd      Mon Aug 27 07:54:18 2018 +0000
+++ b/sys/external/bsd/drm2/drm/drm2netbsd      Mon Aug 27 07:54:28 2018 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#      $NetBSD: drm2netbsd,v 1.1 2018/08/27 00:46:32 riastradh Exp $
+#      $NetBSD: drm2netbsd,v 1.2 2018/08/27 07:54:28 riastradh Exp $
 #
 # $ /path/to/drm2netbsd > /path/to/files.drm.new
 #
@@ -16,6 +16,7 @@
 
 env CONFIG_PCI=y \
 env CONFIG_AGP=y \
+env CONFIG_DRM_FBDEV_EMULATION=y \
 make -f Makefile -V '$(drm-y)' -V '$(drm_kms_helper-y)' \
 | tr ' ' '\n' \
 | grep -v '^$' \
diff -r f50f94c293e7 -r 014de219fe69 sys/external/bsd/drm2/drm/files.drmkms
--- a/sys/external/bsd/drm2/drm/files.drmkms    Mon Aug 27 07:54:18 2018 +0000
+++ b/sys/external/bsd/drm2/drm/files.drmkms    Mon Aug 27 07:54:28 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.drmkms,v 1.24 2018/08/27 06:50:58 riastradh Exp $
+#      $NetBSD: files.drmkms,v 1.25 2018/08/27 07:54:28 riastradh Exp $
 
 include "external/bsd/drm2/linux/files.drmkms_linux"
 
@@ -67,6 +67,7 @@
 file   external/bsd/drm2/dist/drm/drm_drv.c    drmkms
 file   external/bsd/drm2/dist/drm/drm_edid.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_flip_work.c      drmkms
 file   external/bsd/drm2/drm/drm_fops.c        drmkms
 file   external/bsd/drm2/dist/drm/drm_gem.c    drmkms