MFH: r484354 r484855 r484941

Graphics/drm-*-kmod: Update pkg-message

Update pkg-message in drm-stable-kmod, drm-next-kmod and drm-devel-kmod and
point people to drm-legacy-kmod for the legacy drm drivers.

Approved by:	jmd (maintainer, implicit)

graphics/drm-devel-kmod: enable experimental i386 support.

Alongside update to a later snapshot which brings vmwgfx.

Obtained from:	FreeBSDDesktop

graphics/drm-devel-kmod: Fix runtime

Fix runtime after stolen memory handling was comitted.  Use FreeBSD 1200086
as delimiter, since FreeBSD versions wasn't bumped for the stolen memory
commit.

With these updates, drm-kmods are current with what's in ports head.

Approved by:	portmgr (drm-drivers blanket)

8 files changed, 24 insertions, 15 deletions

diff --git a/graphics/drm-devel-kmod/Makefile b/graphics/drm-devel-kmod/Makefile
index 32ed43ae2ea5..25c8320cdcbb 100644
--- a/graphics/drm-devel-kmod/Makefile
+++ b/graphics/drm-devel-kmod/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	drm-devel-kmod
-PORTVERSION=	4.16.g20181027
+PORTVERSION=	4.16.g20181114
 CATEGORIES=	graphics kld
 
 MAINTAINER=	jmd@FreeBSD.org
@@ -11,8 +11,8 @@ COMMENT=	DRM modules for the linuxkpi-based KMS components (development version)
 LICENSE=	BSD2CLAUSE MIT GPLv2
 LICENSE_COMB=	multi
 
-ONLY_FOR_ARCHS=	amd64
-ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64
+ONLY_FOR_ARCHS=	amd64 i386
+ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64 and i386
 
 RUN_DEPENDS=	gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
 
@@ -25,7 +25,7 @@ USES=		kmod uidfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeBSDDesktop
 GH_PROJECT=	kms-drm
-GH_TAGNAME=	96b490e
+GH_TAGNAME=	be98d92
 
 .include <bsd.port.options.mk>
 
@@ -36,4 +36,10 @@ IGNORE=		not supported on older CURRENT, no kernel support
 IGNORE=		not supported on anything but FreeBSD (missing linuxkpi functionality)
 .endif
 
+.if ${ARCH} == "amd64"
+PLIST_SUB=	AMD64=""
+.else
+PLIST_SUB=	AMD64="@comment "
+.endif
+
 .include <bsd.port.mk>
diff --git a/graphics/drm-devel-kmod/distinfo b/graphics/drm-devel-kmod/distinfo
index 3dbed5583553..21eb3bdaf30c 100644
--- a/graphics/drm-devel-kmod/distinfo
+++ b/graphics/drm-devel-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1540634185
-SHA256 (FreeBSDDesktop-kms-drm-4.16.g20181027-96b490e_GH0.tar.gz) = 9e3ee7fd02b275d851a7ddde7f498dee2a733f972f4b72757730fff0b14573db
-SIZE (FreeBSDDesktop-kms-drm-4.16.g20181027-96b490e_GH0.tar.gz) = 12828910
+TIMESTAMP = 1542224521
+SHA256 (FreeBSDDesktop-kms-drm-4.16.g20181114-be98d92_GH0.tar.gz) = 5ed866ec0ec4d322ec1a9deadf2b59910ecf4ebb423b5434aaef6fde7ce6a111
+SIZE (FreeBSDDesktop-kms-drm-4.16.g20181114-be98d92_GH0.tar.gz) = 13079522
diff --git a/graphics/drm-devel-kmod/pkg-message b/graphics/drm-devel-kmod/pkg-message
index 93eaab0001fc..7bca65c4acb6 100644
--- a/graphics/drm-devel-kmod/pkg-message
+++ b/graphics/drm-devel-kmod/pkg-message
@@ -11,5 +11,5 @@ 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 stable kms modules (radeonkms / 
-i915kms) in base.
+Older generations are supported by the legacy kms modules (radeonkms / 
+i915kms) in base or by installing graphics/drm-legacy-kmod.
diff --git a/graphics/drm-devel-kmod/pkg-plist b/graphics/drm-devel-kmod/pkg-plist
index 8930f98d203a..61c7f1a39632 100644
--- a/graphics/drm-devel-kmod/pkg-plist
+++ b/graphics/drm-devel-kmod/pkg-plist
@@ -1,7 +1,8 @@
-/%%KMODDIR%%/amdgpu.ko
-/%%KMODDIR%%/amdkfd.ko
+%%AMD64%%/%%KMODDIR%%/amdgpu.ko
+%%AMD64%%/%%KMODDIR%%/amdkfd.ko
 /%%KMODDIR%%/debugfs.ko
 /%%KMODDIR%%/drm.ko
 /%%KMODDIR%%/i915kms.ko
 /%%KMODDIR%%/linuxkpi_gplv2.ko
 /%%KMODDIR%%/radeonkms.ko
+/%%KMODDIR%%/vmwgfx.ko
diff --git a/graphics/drm-next-kmod/Makefile b/graphics/drm-next-kmod/Makefile
index 2295715fcaec..ba678812e358 100644
--- a/graphics/drm-next-kmod/Makefile
+++ b/graphics/drm-next-kmod/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	drm-next-kmod
 PORTVERSION=	4.11.g20181027
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	jmd@FreeBSD.org
diff --git a/graphics/drm-next-kmod/pkg-message b/graphics/drm-next-kmod/pkg-message
index 2eea852fcbff..6cab67843a2b 100644
--- a/graphics/drm-next-kmod/pkg-message
+++ b/graphics/drm-next-kmod/pkg-message
@@ -11,5 +11,5 @@ 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 stable kms modules (radeonkms / 
-i915kms) in base.
+Older generations are supported by the legacy kms modules (radeonkms / 
+i915kms) in base or by installing graphics/drm-legacy-kmod.
diff --git a/graphics/drm-stable-kmod/Makefile b/graphics/drm-stable-kmod/Makefile
index c07e23c549cc..510311a8ab0c 100644
--- a/graphics/drm-stable-kmod/Makefile
+++ b/graphics/drm-stable-kmod/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	drm-stable-kmod
 PORTVERSION=	g20180822
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	jmd@FreeBSD.org
diff --git a/graphics/drm-stable-kmod/pkg-message b/graphics/drm-stable-kmod/pkg-message
index f681ee8f95cd..f406d554fe2d 100644
--- a/graphics/drm-stable-kmod/pkg-message
+++ b/graphics/drm-stable-kmod/pkg-message
@@ -11,5 +11,5 @@ 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 stable kms modules (radeonkms / 
-i915kms) in base.
+Older generations are supported by the legacy kms modules (radeonkms / 
+i915kms) in base or by installing graphics/drm-legacy-kmod.