diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index 5a2046c0be54..7a7d16f8f205 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -1,36 +1,25 @@
 PORTNAME=	xf86-video-ati
-PORTVERSION=	19.1.0
-PORTREVISION=	7
+DISTVERSION=	22.0.0
 PORTEPOCH=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org ati display driver
-
-PATCH_SITES=	https://gitlab.freedesktop.org/xorg/driver/${PORTNAME}/-/commit/
-PATCHFILES+=	f223035f4ffcff2a9296d1e907a5193f8e8845a3.patch:-p1
-PATCHFILES+=	4d84cf438e7f1bebf0053035ef0292e9fed257d1.patch:-p1
-PATCHFILES+=	c0eb5dbd9c1db6b6d5b1574bcd8c584170d7ab54.patch:-p1
-PATCHFILES+=	3845392426e9798c1fb2a6fc5e97bf5dfd5c443d.patch:-p1
-PATCHFILES+=	8da3e4561ef82bb78c9a17b8cd8bf139b9cfd680.patch:-p1
-
-EXTRA_PATCHES=	${FILESDIR}/0001_dont_set_sourcevalidate_pointer_to_null.diff:-p1
+COMMENT=	ATI/AMD Radeon video driver for the Xorg X server
+WWW=		https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # No Radeon kernel driver on non-x86.
 ONLY_FOR_ARCHS=		aarch64 amd64 i386 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	KMS is required and currently only available on x86/arm64/powerpc64
 
-LIB_DEPENDS=	libpciaccess.so:devel/libpciaccess \
-		libdrm_radeon.so:graphics/libdrm
+LIB_DEPENDS=	libdrm_radeon.so:graphics/libdrm
 
-USES=		gl xorg xorg-cat:driver
-USE_GL=		gl
+USES=		gl tar:xz xorg xorg-cat:driver
+USE_GL=		gbm
 USE_XORG=	pciaccess
 
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS+=--disable-udev
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-ati/distinfo b/x11-drivers/xf86-video-ati/distinfo
index f816e412dfa2..289271acfc44 100644
--- a/x11-drivers/xf86-video-ati/distinfo
+++ b/x11-drivers/xf86-video-ati/distinfo
@@ -1,13 +1,3 @@
-TIMESTAMP = 1656682698
-SHA256 (xorg/driver/xf86-video-ati-19.1.0.tar.bz2) = 659f5a1629eea5f5334d9b39b18e6807a63aa1efa33c1236d9cc53acbb223c49
-SIZE (xorg/driver/xf86-video-ati-19.1.0.tar.bz2) = 904558
-SHA256 (xorg/driver/f223035f4ffcff2a9296d1e907a5193f8e8845a3.patch) = 34395b16c7849b342a2db62a08eb41dacbb1878583d47692cb6a798b7fd0a60d
-SIZE (xorg/driver/f223035f4ffcff2a9296d1e907a5193f8e8845a3.patch) = 991
-SHA256 (xorg/driver/4d84cf438e7f1bebf0053035ef0292e9fed257d1.patch) = c3bfbb8ba6a979f33b779f612306bf27e71a96ce77da8ec193480bb46d100afa
-SIZE (xorg/driver/4d84cf438e7f1bebf0053035ef0292e9fed257d1.patch) = 693
-SHA256 (xorg/driver/c0eb5dbd9c1db6b6d5b1574bcd8c584170d7ab54.patch) = 00c001f873078ccfd7541c7e6369a5cd7e97a3206326f37dff21eb01faff1b8b
-SIZE (xorg/driver/c0eb5dbd9c1db6b6d5b1574bcd8c584170d7ab54.patch) = 3679
-SHA256 (xorg/driver/3845392426e9798c1fb2a6fc5e97bf5dfd5c443d.patch) = ba978104ed1209a4e4f0a1e6067b5044745786c6f0183ba756e9860faa8ef914
-SIZE (xorg/driver/3845392426e9798c1fb2a6fc5e97bf5dfd5c443d.patch) = 1867
-SHA256 (xorg/driver/8da3e4561ef82bb78c9a17b8cd8bf139b9cfd680.patch) = fb3c215b742def4a3a412adbcefe5f4d9f36ce9c56af274dbcf50c389d2cd171
-SIZE (xorg/driver/8da3e4561ef82bb78c9a17b8cd8bf139b9cfd680.patch) = 14196
+TIMESTAMP = 1785188950
+SHA256 (xorg/driver/xf86-video-ati-22.0.0.tar.xz) = c8c8bb56d3f6227c97e59c3a3c85a25133584ceb82ab5bc05a902a743ab7bf6d
+SIZE (xorg/driver/xf86-video-ati-22.0.0.tar.xz) = 755812
diff --git a/x11-drivers/xf86-video-ati/files/0001_dont_set_sourcevalidate_pointer_to_null.diff b/x11-drivers/xf86-video-ati/files/0001_dont_set_sourcevalidate_pointer_to_null.diff
deleted file mode 100644
index 080de79e37bd..000000000000
--- a/x11-drivers/xf86-video-ati/files/0001_dont_set_sourcevalidate_pointer_to_null.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/src/radeon_kms.c b/src/radeon_kms.c
-index 62962d61d8ee22a02567b7125b4bb3a7f7230be4..51b00dd9b013d183bf93d7f5578014dc16c80ce8 100644
---- a/src/radeon_kms.c
-+++ b/src/radeon_kms.c
-@@ -931,6 +931,13 @@ radeon_dirty_update(ScrnInfoPtr scrn)
- 	}
- }
- 
-+static void
-+radeonSourceValidate(DrawablePtr draw, int x, int y, int w, int h,
-+		     unsigned int subWindowMode)
-+{
-+}
-+
-+
- 
- Bool
- radeon_scanout_do_update(xf86CrtcPtr xf86_crtc, int scanout_id,
-@@ -993,7 +1000,7 @@ radeon_scanout_do_update(xf86CrtcPtr xf86_crtc, int scanout_id,
- 	    SetPicturePictFilter(src, xf86_crtc->filter, xf86_crtc->params,
- 				 xf86_crtc->nparams);
- 
--	pScreen->SourceValidate = NULL;
-+	pScreen->SourceValidate = radeonSourceValidate;
- 	CompositePicture(PictOpSrc,
- 			 src, NULL, dst,
- 			 extents.x1, extents.y1, 0, 0, extents.x1,
diff --git a/x11-drivers/xf86-video-ati/pkg-descr b/x11-drivers/xf86-video-ati/pkg-descr
index fe1b01b2281a..4dff34d5b4e2 100644
--- a/x11-drivers/xf86-video-ati/pkg-descr
+++ b/x11-drivers/xf86-video-ati/pkg-descr
@@ -1 +1,2 @@
-This package contains the X.Org xf86-video-ati driver.
+This package contains the Xorg driver for ATI/AMD Radeon GPUs using the
+radeon kernel driver.