diff --git a/graphics/drm-current-kmod/Makefile b/graphics/drm-current-kmod/Makefile
index 7be8ddbd87ed..ce86da0cab2d 100644
--- a/graphics/drm-current-kmod/Makefile
+++ b/graphics/drm-current-kmod/Makefile
@@ -1,75 +1,75 @@
 # Created by: Johannes Dieterich <jmd@FreeBSD.org>
 
 PORTNAME=	drm-current-kmod
-PORTVERSION=	5.4.144.g20210908
+PORTVERSION=	5.4.144.g20210929
 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.144
+GH_TAGNAME=	drm_v5.4.144_1
 
 .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 98485fc0d15f..94b3c644c037 100644
--- a/graphics/drm-current-kmod/distinfo
+++ b/graphics/drm-current-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1631056489
-SHA256 (freebsd-drm-kmod-5.4.144.g20210908-drm_v5.4.144_GH0.tar.gz) = 576a0126a9749e337b4858480f7c29b21dab0d61c534daef126a3044ada960a0
-SIZE (freebsd-drm-kmod-5.4.144.g20210908-drm_v5.4.144_GH0.tar.gz) = 18823957
+TIMESTAMP = 1632948160
+SHA256 (freebsd-drm-kmod-5.4.144.g20210929-drm_v5.4.144_1_GH0.tar.gz) = 968726baa7eaf03dfc78f224cc2c0f7afc763607d79e8b3b1eae9f2d485fa7d5
+SIZE (freebsd-drm-kmod-5.4.144.g20210929-drm_v5.4.144_1_GH0.tar.gz) = 18825506
diff --git a/graphics/drm-devel-kmod/Makefile b/graphics/drm-devel-kmod/Makefile
index 253c1e285174..083a13a2ad6a 100644
--- a/graphics/drm-devel-kmod/Makefile
+++ b/graphics/drm-devel-kmod/Makefile
@@ -1,57 +1,57 @@
 # Created by: Johannes Dieterich <jmd@FreeBSD.org>
 
 PORTNAME=	drm-devel-kmod
-PORTVERSION=	5.5.19.g20210909
+PORTVERSION=	5.5.19.g20210929
 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.5.19_3
+GH_TAGNAME=	drm_v5.5.19_4
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && (${OSVERSION} < 1300513 || \
 	(${OSVERSION} < 1400024 && ${OSVERSION} >= 1400000))
 IGNORE=		not supported on older CURRENT/STABLE, 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 0e3381cd0d4f..d08202c39928 100644
--- a/graphics/drm-devel-kmod/distinfo
+++ b/graphics/drm-devel-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1631140463
-SHA256 (freebsd-drm-kmod-5.5.19.g20210909-drm_v5.5.19_3_GH0.tar.gz) = 28d57efc6c880aad673da80b9ae1b05482ff15b0886dedd56de6bc35092930de
-SIZE (freebsd-drm-kmod-5.5.19.g20210909-drm_v5.5.19_3_GH0.tar.gz) = 18894886
+TIMESTAMP = 1632948087
+SHA256 (freebsd-drm-kmod-5.5.19.g20210929-drm_v5.5.19_4_GH0.tar.gz) = 40ad241cb3194b68a2f16b9a748776c4817398c1924b4384dece8c693f420abc
+SIZE (freebsd-drm-kmod-5.5.19.g20210929-drm_v5.5.19_4_GH0.tar.gz) = 18895228