10 files changed, 117 insertions, 6 deletions

diff --git a/MOVED b/MOVED
index 4e60261c4137..be4d6942d49f 100644
--- a/MOVED
+++ b/MOVED
@@ -10667,7 +10667,6 @@ math/vtk5-data||2018-12-05|Removed
 devel/py-interface|devel/py-py_interface|2018-12-05|Rename to match upstream naming
 graphics/drm-stable-kmod|graphics/drm-fbsd11.2-kmod|2018-12-09|Cleaning up DRM ports nomenclature
 graphics/drm-next-kmod|graphics/drm-fbsd12.0-kmod|2018-12-09|Cleaning up DRM ports nomenclature
-graphics/drm-devel-kmod|graphics/drm-current-kmod|2018-12-09|Cleaning up DRM ports nomenclature
 deskutils/multisync-backup||2018-12-11|Has expired: GNOME 2 application
 deskutils/multisync-syncml||2018-12-11|Has expired: GNOME 2 application
 net/g2ipmsg||2018-12-11|Has expired: GNOME 2 application
diff --git a/graphics/drm-current-kmod/Makefile b/graphics/drm-current-kmod/Makefile
index 93da3beee199..a026dfa03c86 100644
--- a/graphics/drm-current-kmod/Makefile
+++ b/graphics/drm-current-kmod/Makefile
@@ -16,7 +16,10 @@ ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64 and i3
 
 RUN_DEPENDS=	gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
 
-CONFLICTS_INSTALL=	drm-fbsd11.2-kmod drm-fbsd12.0-kmod drm-legacy-kmod
+CONFLICTS_INSTALL=	drm-devel-kmod \
+			drm-fbsd11.2-kmod \
+			drm-fbsd12.0-kmod \
+			drm-legacy-kmod
 
 OPTIONS_DEFINE=	DEBUG
 
@@ -29,7 +32,7 @@ GH_TAGNAME=	b890994
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200067
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300029
 IGNORE=		not supported on older CURRENT, no kernel support
 .endif
 .if ${OPSYS} != FreeBSD
diff --git a/graphics/drm-devel-kmod/Makefile b/graphics/drm-devel-kmod/Makefile
new file mode 100644
index 000000000000..a8d0589fc228
--- /dev/null
+++ b/graphics/drm-devel-kmod/Makefile
@@ -0,0 +1,64 @@
+# Created by: Johannes Dieterich <jmd@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	drm-devel-kmod
+PORTVERSION=	5.0.g20190520
+CATEGORIES=	graphics kld
+
+MAINTAINER=	jmd@FreeBSD.org
+COMMENT=	DRM modules for the linuxkpi-based KMS components (development version)
+
+LICENSE=	BSD2CLAUSE MIT GPLv2
+LICENSE_COMB=	multi
+
+ONLY_FOR_ARCHS=	amd64 i386 powerpc64
+ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64, i386 and powerpc64
+
+RUN_DEPENDS=	gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
+
+CONFLICTS_INSTALL=	drm-current-kmod \
+			drm-fbsd11.2-kmod \
+			drm-fbsd12.0-kmod \
+			drm-legacy-kmod
+
+OPTIONS_DEFINE=	DEBUG
+
+USES=		kmod uidfix compiler:c++11-lang
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	FreeBSDDesktop
+GH_PROJECT=	kms-drm
+GH_TAGNAME=	4d4b2ba
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300029
+IGNORE=		not supported on older CURRENT, no kernel support
+.endif
+.if ${OPSYS} != FreeBSD
+IGNORE=		not supported on anything but FreeBSD (missing linuxkpi functionality)
+.endif
+
+.if ${ARCH} == "amd64"
+PLIST_SUB+=	AMDGPU=""
+PLIST_SUB+=	AMDKFD=""
+PLIST_SUB+=	I915=""
+PLIST_SUB+=	VMWGFX=""
+.elif ${ARCH} == "i386"
+PLIST_SUB+=	AMDGPU="@comment "
+PLIST_SUB+=	AMDKFD="@comment "
+PLIST_SUB+=	I915=""
+PLIST_SUB+=     VMWGFX=""
+.elif ${ARCH} == "powerpc64"
+PLIST_SUB+=	AMDGPU=""
+PLIST_SUB+=	AMDKFD="@comment " 
+PLIST_SUB+=	I915="@comment "
+PLIST_SUB+=     VMWGFX="@comment "
+.else
+PLIST_SUB+=	AMDGPU="@comment "
+PLIST_SUB+=	AMDKFD="@comment "
+PLIST_SUB+=	I915="@comment "
+PLIST_SUB+=     VMWGFX="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/graphics/drm-devel-kmod/distinfo b/graphics/drm-devel-kmod/distinfo
new file mode 100644
index 000000000000..d2f0054503f6
--- /dev/null
+++ b/graphics/drm-devel-kmod/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1558375618
+SHA256 (FreeBSDDesktop-kms-drm-5.0.g20190520-4d4b2ba_GH0.tar.gz) = 5a2fad2bf1cecdcad30e7d58b5e9f5fc500b8f51a8966ffe35066246d47ff5fe
+SIZE (FreeBSDDesktop-kms-drm-5.0.g20190520-4d4b2ba_GH0.tar.gz) = 14590222
diff --git a/graphics/drm-devel-kmod/pkg-descr b/graphics/drm-devel-kmod/pkg-descr
new file mode 100644
index 000000000000..0cd7155895a9
--- /dev/null
+++ b/graphics/drm-devel-kmod/pkg-descr
@@ -0,0 +1,6 @@
+amdgpu, i915, and radeon DRM modules for the linuxkpi-based KMS components.
+Currently corresponding to Linux 5.0 DRM.
+This version is the development version and only works on FreeBSD CURRENT.
+amdgpu and radeonkms are known to fail with EFI boot.
+
+WWW: https://github.com/FreeBSDDesktop/kms-drm
diff --git a/graphics/drm-devel-kmod/pkg-message b/graphics/drm-devel-kmod/pkg-message
new file mode 100644
index 000000000000..509efb8b61d0
--- /dev/null
+++ b/graphics/drm-devel-kmod/pkg-message
@@ -0,0 +1,19 @@
+The experimental drm-devel-kmod port can be enabled for amdgpu (for AMD
+GPUs starting with the HD7000 series / Tahiti), radeonkms for older AMD GPUs
+or i915kms (for Intel APUs starting with HD3000 / Sandy Bridge, possibly even
+older) through kld_list in /etc/rc.conf.
+
+For amdgpu and radeonkms, there have been reports of issues when using UEFI
+firmware boot.  You might need to disable the console by adding
+hw.syscons.disable=1  to /boot/loader.conf . Please note that this will
+disable the console until the graphics driver is loaded.
+
+For amdgpu: kld_list="amdgpu"
+For Intel: kld_list="/boot/modules/i915kms.ko"
+For radeonkms: kld_list="/boot/modules/radeonkms.ko"
+
+Please ensure that all users requiring graphics are members of the
+"video" group.
+
+Older generations are supported by the legacy kms modules by installing
+graphics/drm-legacy-kmod.
diff --git a/graphics/drm-devel-kmod/pkg-plist b/graphics/drm-devel-kmod/pkg-plist
new file mode 100644
index 000000000000..d58a2084b1f2
--- /dev/null
+++ b/graphics/drm-devel-kmod/pkg-plist
@@ -0,0 +1,8 @@
+%%AMDGPU%%/%%KMODDIR%%/amdgpu.ko
+%%AMDKFD%%/%%KMODDIR%%/amdkfd.ko
+/%%KMODDIR%%/drm.ko
+%%I915%%/%%KMODDIR%%/i915kms.ko
+/%%KMODDIR%%/linuxkpi_gplv2.ko
+/%%KMODDIR%%/radeonkms.ko
+/%%KMODDIR%%/ttm.ko
+%%VMWGFX%%/%%KMODDIR%%/vmwgfx.ko
diff --git a/graphics/drm-fbsd11.2-kmod/Makefile b/graphics/drm-fbsd11.2-kmod/Makefile
index bd00a869c8b7..a727b5ce6d6c 100644
--- a/graphics/drm-fbsd11.2-kmod/Makefile
+++ b/graphics/drm-fbsd11.2-kmod/Makefile
@@ -16,7 +16,10 @@ ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64
 
 RUN_DEPENDS=	gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
 
-CONFLICTS_INSTALL=	drm-fbsd12.0-kmod drm-current-kmod drm-legacy-kmod
+CONFLICTS_INSTALL=	drm-devel-kmod \
+			drm-fbsd12.0-kmod \
+			drm-current-kmod \
+			drm-legacy-kmod
 
 OPTIONS_DEFINE=	DEBUG
 
diff --git a/graphics/drm-fbsd12.0-kmod/Makefile b/graphics/drm-fbsd12.0-kmod/Makefile
index 10e3d8cca6aa..a992d9110d11 100644
--- a/graphics/drm-fbsd12.0-kmod/Makefile
+++ b/graphics/drm-fbsd12.0-kmod/Makefile
@@ -16,7 +16,10 @@ ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64 and i3
 
 RUN_DEPENDS=	gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
 
-CONFLICTS_INSTALL=	drm-fbsd11.2-kmod drm-current-kmod drm-legacy-kmod
+CONFLICTS_INSTALL=	drm-devel-kmod \
+			drm-fbsd11.2-kmod \
+			drm-current-kmod \
+			drm-legacy-kmod
 
 OPTIONS_DEFINE=	DEBUG
 
diff --git a/graphics/drm-legacy-kmod/Makefile b/graphics/drm-legacy-kmod/Makefile
index 390e65d15bab..07e61cf0d524 100644
--- a/graphics/drm-legacy-kmod/Makefile
+++ b/graphics/drm-legacy-kmod/Makefile
@@ -19,7 +19,10 @@ USES=		kmod uidfix
 
 OPTIONS_DEFINE=	DEBUG
 
-CONFLICTS_INSTALL=	drm-fbsd11.2-kmod drm-fbsd12.0-kmod drm-current-kmod
+CONFLICTS_INSTALL=	drm-devel-kmod \
+			drm-fbsd11.2-kmod \
+			drm-fbsd12.0-kmod \
+			drm-current-kmod
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeBSDDesktop