Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:54:28 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/drm: drm2netbsd files.drmkms
Log Message:
drm_fb_helper.c got lost in the merge, restore it.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/drm/drm2netbsd
cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/drm2/drm/files.drmkms
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/drm/drm2netbsd
diff -u src/sys/external/bsd/drm2/drm/drm2netbsd:1.1 src/sys/external/bsd/drm2/drm/drm2netbsd:1.2
--- src/sys/external/bsd/drm2/drm/drm2netbsd:1.1 Mon Aug 27 00:46:32 2018
+++ src/sys/external/bsd/drm2/drm/drm2netbsd Mon Aug 27 07:54:28 2018
@@ -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 @@ drmkms_flag=drmkms
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 '^$' \
Index: src/sys/external/bsd/drm2/drm/files.drmkms
diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.24 src/sys/external/bsd/drm2/drm/files.drmkms:1.25
--- src/sys/external/bsd/drm2/drm/files.drmkms:1.24 Mon Aug 27 06:50:58 2018
+++ src/sys/external/bsd/drm2/drm/files.drmkms Mon Aug 27 07:54:28 2018
@@ -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_dp_m
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
