diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
--- a/graphics/mesa-dri/Makefile
+++ b/graphics/mesa-dri/Makefile
@@ -29,15 +29,20 @@
 .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
 
 ALL_DRI_DRIVERS=	I915 I965 R100 R200
-ALL_GALLIUM_DRIVERS=	CROCUS IRIS R300 R600 RADEONSI SVGA SWRAST
-ALL_VULKAN_DRIVERS=	INTEL AMD
+ALL_GALLIUM_DRIVERS=	CROCUS IRIS PANFROST R300 R600 RADEONSI SVGA SWRAST
+ALL_VULKAN_DRIVERS=	INTEL AMD SWRAST
 
 GALLIUM_DRIVERS+=	SWRAST	# llvmpipe
+VULKAN_DRIVERS+=	SWRAST	# lavapipe
 
 .if ${ARCH:Marm*}
 DRI_DRIVERS+=	R100
 .endif
 
+.if ${ARCH} == aarch64
+GALLIUM_DRIVERS+=	PANFROST
+.endif
+
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 \
  || ${ARCH:Mpowerpc*} || ${ARCH} == riscv64
 DRI_DRIVERS+=		R100 R200
diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common
--- a/graphics/mesa-dri/Makefile.common
+++ b/graphics/mesa-dri/Makefile.common
@@ -12,7 +12,7 @@
 MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
-MESABASEVERSION=	21.3.6
+MESABASEVERSION=	21.3.7
 # if there is a subversion, don't include the '-' between 7.11-rc2.
 MESASUBVERSION=
 
diff --git a/graphics/mesa-dri/distinfo b/graphics/mesa-dri/distinfo
--- a/graphics/mesa-dri/distinfo
+++ b/graphics/mesa-dri/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644492138
-SHA256 (mesa-21.3.6.tar.xz) = 96bb761fd546e9aa41d025fcc025225c5668443839dae21e3731959beb096736
-SIZE (mesa-21.3.6.tar.xz) = 16544464
+TIMESTAMP = 1645683167
+SHA256 (mesa-21.3.7.tar.xz) = b4fa9db7aa61bf209ef0b40bef83080999d86ad98df8b8b4fada7c128a1efc3d
+SIZE (mesa-21.3.7.tar.xz) = 16569592
diff --git a/graphics/mesa-dri/pkg-plist b/graphics/mesa-dri/pkg-plist
--- a/graphics/mesa-dri/pkg-plist
+++ b/graphics/mesa-dri/pkg-plist
@@ -9,6 +9,8 @@
 %%I915_DRIVER%%lib/dri/i915_dri.so
 %%I965_DRIVER%%lib/dri/i965_dri.so
 %%IRIS_GDRIVER%%lib/dri/iris_dri.so
+%%PANFROST_GDRIVER%%lib/dri/panfrost_dri.so
+%%PANFROST_GDRIVER%%lib/dri/rockchip_dri.so
 %%SWRAST_GDRIVER%%lib/dri/kms_swrast_dri.so
 %%R200_DRIVER%%lib/dri/r200_dri.so
 %%R300_GDRIVER%%lib/dri/r300_dri.so
@@ -29,9 +31,11 @@
 @comment lib/libglapi.so.0.0.0
 %%INTEL_VDRIVER%%lib/libvulkan_intel.so
 %%AMD_VDRIVER%%lib/libvulkan_radeon.so
+%%SWRAST_VDRIVER%%lib/libvulkan_lvp.so
 libdata/pkgconfig/dri.pc
 @comment libdata/pkgconfig/gbm.pc
 share/drirc.d/00-mesa-defaults.conf
 share/drirc.d/01-freebsd.conf
 %%INTEL_VDRIVER%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json
 %%AMD_VDRIVER%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json
+%%SWRAST_VDRIVER%%share/vulkan/icd.d/lvp_icd.%%ARCH%%.json