diff --git a/graphics/drm-current-kmod/Makefile b/graphics/drm-current-kmod/Makefile
index d673793794a8..f44dffb7f3c1 100644
--- a/graphics/drm-current-kmod/Makefile
+++ b/graphics/drm-current-kmod/Makefile
@@ -1,76 +1,75 @@
 # Created by: Johannes Dieterich <jmd@FreeBSD.org>
 
 PORTNAME=	drm-current-kmod
-PORTVERSION=	5.4.92.g20210128
-PORTREVISION=	2
+PORTVERSION=	5.4.92.g20210419
 CATEGORIES=	graphics kld
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	DRM modules for the linuxkpi-based KMS components
 
 LICENSE=	BSD2CLAUSE MIT GPLv2
 LICENSE_COMB=	multi
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64, i386, aarch64 and powerpc64
 
 RUN_DEPENDS=	gpu-firmware-kmod>=g20200914:graphics/gpu-firmware-kmod
 
 CONFLICTS_INSTALL=	drm-devel-kmod
 
 OPTIONS_DEFINE=	DEBUG SOURCE
 
 SOURCE_DESC=	Install kernel module sources
 
 OPTIONS_SUB=	yes
 
 USES=		kmod uidfix compiler:c++11-lang
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_PROJECT=	drm-kmod
-GH_TAGNAME=	drm_v5.4.92_1
+GH_TAGNAME=	drm_v5.4.92_3
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1400000
 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+=	I915=""
 .elif ${ARCH} == "i386"
 PLIST_SUB+=	AMDGPU="@comment "
 PLIST_SUB+=	I915=""
 .elif ${ARCH} == "aarch64" || ${ARCH:Mpowerpc*}
 PLIST_SUB+=	AMDGPU=""
 PLIST_SUB+=	I915="@comment "
 .else
 PLIST_SUB+=	AMDGPU="@comment "
 PLIST_SUB+=	I915="@comment "
 .endif
 
 KMODSRC=	${STAGEDIR}${PREFIX}/sys/modules/${PORTNAME}
 SRCDIRS=	amd drivers drm i915 include linuxkpi radeon ttm vmwgfx vboxvideo
 
 PLIST_SUB+=	KMODSRC="sys/modules/${PORTNAME}"
 
 MAKE_ENV+=	MAKEOBJDIRPREFIX=${WRKSRC}/obj
 
 pre-build:
 		${MKDIR} ${WRKSRC}/obj
 		(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} obj)
 
 post-install-SOURCE-on:
 		${MKDIR} ${KMODSRC}
 		${INSTALL_DATA} ${WRKSRC}/Makefile ${KMODSRC}
 		${INSTALL_DATA} ${WRKSRC}/kconfig.mk ${KMODSRC}
 .for dir in ${SRCDIRS}
 		cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${KMODSRC}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/graphics/drm-current-kmod/distinfo b/graphics/drm-current-kmod/distinfo
index 064486e9accb..14ea4a7ebf4c 100644
--- a/graphics/drm-current-kmod/distinfo
+++ b/graphics/drm-current-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611876331
-SHA256 (freebsd-drm-kmod-5.4.92.g20210128-drm_v5.4.92_1_GH0.tar.gz) = 4c16ee4e94d3676c763ffeec0f5ebcb63c881a34e7aa693859b42b6411bbfa54
-SIZE (freebsd-drm-kmod-5.4.92.g20210128-drm_v5.4.92_1_GH0.tar.gz) = 18825277
+TIMESTAMP = 1618819868
+SHA256 (freebsd-drm-kmod-5.4.92.g20210419-drm_v5.4.92_3_GH0.tar.gz) = fb6177a38b6052900d37fb3c36f402cb2a3fbd3f15361f7b9e4ed50c248f40b6
+SIZE (freebsd-drm-kmod-5.4.92.g20210419-drm_v5.4.92_3_GH0.tar.gz) = 18826688
diff --git a/graphics/drm-devel-kmod/Makefile b/graphics/drm-devel-kmod/Makefile
index ab1c5c76b471..212f533c7e09 100644
--- a/graphics/drm-devel-kmod/Makefile
+++ b/graphics/drm-devel-kmod/Makefile
@@ -1,57 +1,56 @@
 # Created by: Johannes Dieterich <jmd@FreeBSD.org>
 
 PORTNAME=	drm-devel-kmod
-PORTVERSION=	5.4.92.g20210128
-PORTREVISION=	1
+PORTVERSION=	5.4.92.g20210419
 CATEGORIES=	graphics kld
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	DRM modules for the linuxkpi-based KMS components (development version)
 
 LICENSE=	BSD2CLAUSE MIT GPLv2
 LICENSE_COMB=	multi
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64, arm64, i386 and powerpc64
 
 RUN_DEPENDS=	gpu-firmware-kmod>=g20200914:graphics/gpu-firmware-kmod
 
 CONFLICTS_INSTALL=	drm-current-kmod
 
 OPTIONS_DEFINE=	DEBUG
 
 USES=		kmod uidfix compiler:c++11-lang
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_PROJECT=	drm-kmod
-GH_TAGNAME=	drm_v5.4.92_1
+GH_TAGNAME=	drm_v5.4.92_3
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1400000
 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="@comment "
 PLIST_SUB+=	I915=""
 .elif ${ARCH} == "i386"
 PLIST_SUB+=	AMDGPU="@comment "
 PLIST_SUB+=	AMDKFD="@comment "
 PLIST_SUB+=	I915=""
 .elif ${ARCH} == "aarch64" || ${ARCH:Mpowerpc*}
 PLIST_SUB+=	AMDGPU=""
 PLIST_SUB+=	AMDKFD="@comment " 
 PLIST_SUB+=	I915="@comment "
 .else
 PLIST_SUB+=	AMDGPU="@comment "
 PLIST_SUB+=	AMDKFD="@comment "
 PLIST_SUB+=	I915="@comment "
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/drm-devel-kmod/distinfo b/graphics/drm-devel-kmod/distinfo
index b279c6d10d87..44d2f8b8cb18 100644
--- a/graphics/drm-devel-kmod/distinfo
+++ b/graphics/drm-devel-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611876357
-SHA256 (freebsd-drm-kmod-5.4.92.g20210128-drm_v5.4.92_1_GH0.tar.gz) = 4c16ee4e94d3676c763ffeec0f5ebcb63c881a34e7aa693859b42b6411bbfa54
-SIZE (freebsd-drm-kmod-5.4.92.g20210128-drm_v5.4.92_1_GH0.tar.gz) = 18825277
+TIMESTAMP = 1618819903
+SHA256 (freebsd-drm-kmod-5.4.92.g20210419-drm_v5.4.92_3_GH0.tar.gz) = fb6177a38b6052900d37fb3c36f402cb2a3fbd3f15361f7b9e4ed50c248f40b6
+SIZE (freebsd-drm-kmod-5.4.92.g20210419-drm_v5.4.92_3_GH0.tar.gz) = 18826688