graphics/drm-612-kmod: new port

Reviewed by:	dumbbell, emaste
Approved by:	lwhsu (mentor, implicitly)
Differential Revision:	https://reviews.freebsd.org/D56888

12 files changed, 114 insertions, 15 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 43bc3f60b0df..e0a8f409ecdd 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -159,6 +159,7 @@
     SUBDIR += drm-515-kmod
     SUBDIR += drm-61-kmod
     SUBDIR += drm-66-kmod
+    SUBDIR += drm-612-kmod
     SUBDIR += drm-kmod
     SUBDIR += drm-latest-kmod
     SUBDIR += drm_info
diff --git a/graphics/drm-515-kmod/Makefile b/graphics/drm-515-kmod/Makefile
index 113c9a67066c..4e5eaae35280 100644
--- a/graphics/drm-515-kmod/Makefile
+++ b/graphics/drm-515-kmod/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	graphics kld
 .include "Makefile.version"
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	Direct Rendering Manager GPU drivers
+COMMENT=	Direct Rendering Manager (DRM) GPU drivers
 WWW=		https://github.com/freebsd/drm-kmod/
 
 LICENSE=	BSD2CLAUSE MIT GPLv2
@@ -15,8 +15,10 @@ LICENSE_COMB=	multi
 ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64 and powerpc64
 
-CONFLICTS_INSTALL=	drm-61-kmod \
-			drm-66-kmod
+CONFLICTS_INSTALL=	drm-latest-kmod \
+			drm-61-kmod \
+			drm-66-kmod \
+			drm-612-kmod
 
 USES=		kmod uidfix compiler:c++11-lang
 
diff --git a/graphics/drm-61-kmod/Makefile b/graphics/drm-61-kmod/Makefile
index e66953102620..c095880d5f97 100644
--- a/graphics/drm-61-kmod/Makefile
+++ b/graphics/drm-61-kmod/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	graphics kld
 .include "Makefile.version"
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	Direct Rendering Manager GPU drivers
+COMMENT=	Direct Rendering Manager (DRM) GPU drivers
 WWW=		https://github.com/freebsd/drm-kmod/
 
 LICENSE=	BSD2CLAUSE MIT GPLv2
@@ -15,8 +15,10 @@ LICENSE_COMB=	multi
 ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64 and powerpc64
 
-CONFLICTS_INSTALL=	drm-515-kmod \
-			drm-66-kmod
+CONFLICTS_INSTALL=	drm-latest-kmod \
+			drm-515-kmod \
+			drm-66-kmod \
+			drm-612-kmod
 
 USES=		kmod uidfix compiler:c++11-lang
 
diff --git a/graphics/drm-612-kmod/Makefile b/graphics/drm-612-kmod/Makefile
new file mode 100644
index 000000000000..c6dc38595bc1
--- /dev/null
+++ b/graphics/drm-612-kmod/Makefile
@@ -0,0 +1,48 @@
+PORTNAME=	drm-612-kmod
+DISTVERSION=	${DRM_KMOD_DISTVERSION}
+CATEGORIES=	graphics kld
+
+.include "Makefile.version"
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	Direct Rendering Manager (DRM) GPU drivers
+WWW=		https://github.com/freebsd/drm-kmod/
+
+LICENSE=	BSD2CLAUSE MIT GPLv2
+LICENSE_COMB=	multi
+
+ONLY_FOR_ARCHS=	amd64
+ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64
+
+CONFLICTS_INSTALL=	drm-latest-kmod \
+			drm-515-kmod \
+			drm-61-kmod \
+			drm-66-kmod
+
+USES=		kmod uidfix compiler:c++11-lang
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	freebsd
+GH_PROJECT=	drm-kmod
+GH_TAGNAME=	${DRM_KMOD_GH_TAGNAME}
+
+.include <bsd.port.options.mk>
+
+SUB_FILES=	pkg-message
+SUB_LIST=	PORTNAME=${PORTNAME} OPSYS=${OPSYS} OSREL=${OSREL}
+
+.if ${OPSYS} != FreeBSD
+IGNORE=         not supported on anything but FreeBSD (missing linuxkpi functionality)
+.elif ${OSVERSION} < 1500509
+IGNORE=         not supported on FreeBSD < 1500509, no kernel support
+.elif 1600000 <= ${OSVERSION} && ${OSVERSION} < 1600018
+IGNORE=         not supported on FreeBSD 16 before 1600018, no kernel support
+.endif
+
+MAKE_ENV+=	MAKEOBJDIRPREFIX=${WRKSRC}/obj
+
+pre-build:
+		${MKDIR} ${WRKSRC}/obj
+		(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} obj)
+
+.include <bsd.port.mk>
diff --git a/graphics/drm-612-kmod/Makefile.version b/graphics/drm-612-kmod/Makefile.version
new file mode 100644
index 000000000000..c2b74d18f6a7
--- /dev/null
+++ b/graphics/drm-612-kmod/Makefile.version
@@ -0,0 +1,5 @@
+# drm-kmod common version definition
+#
+# This will be included from consumers such as nvidia-drm
+DRM_KMOD_DISTVERSION=	6.12.85
+DRM_KMOD_GH_TAGNAME=	drm_v6.12.85_1
diff --git a/graphics/drm-612-kmod/distinfo b/graphics/drm-612-kmod/distinfo
new file mode 100644
index 000000000000..fcd33beba93e
--- /dev/null
+++ b/graphics/drm-612-kmod/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1778246100
+SHA256 (freebsd-drm-kmod-6.12.85-drm_v6.12.85_1_GH0.tar.gz) = 418b81a5d83f269ecb6ac3cdab663684614df07ce87d65ebdab74889c0d6be9e
+SIZE (freebsd-drm-kmod-6.12.85-drm_v6.12.85_1_GH0.tar.gz) = 44075974
diff --git a/graphics/drm-612-kmod/files/pkg-message.in b/graphics/drm-612-kmod/files/pkg-message.in
new file mode 100644
index 000000000000..95465e0ab188
--- /dev/null
+++ b/graphics/drm-612-kmod/files/pkg-message.in
@@ -0,0 +1,22 @@
+[
+{ type: install
+  message: <<EOM
+The %%PORTNAME%% port can be enabled for amdgpu (for AMD
+GPUs starting with the HD7000 series / Tahiti) or i915kms (for Intel
+APUs starting with HD3000 / Sandy Bridge) through kld_list in
+/etc/rc.conf. radeonkms for older AMD GPUs can be loaded and there are
+some positive reports if EFI boot is NOT enabled.
+
+For amdgpu: kld_list="amdgpu"
+For Intel: kld_list="i915kms"
+For radeonkms: kld_list="radeonkms"
+
+Please ensure that all users requiring graphics are members of the
+"video" group.
+
+Please note that this package was built for %%OPSYS%% %%OSREL%%.
+If this is not your current running version, please rebuild
+it from ports to prevent panics when loading the module.
+EOM
+}
+]
diff --git a/graphics/drm-612-kmod/pkg-descr b/graphics/drm-612-kmod/pkg-descr
new file mode 100644
index 000000000000..37c8f1eb6e1a
--- /dev/null
+++ b/graphics/drm-612-kmod/pkg-descr
@@ -0,0 +1,4 @@
+amdgpu, i915, and radeon DRM drivers modules.
+Currently corresponding to Linux 6.12 DRM.
+This version is for FreeBSD 15 1500509
+and above, or FreeBSD 16 1600018 and above.
diff --git a/graphics/drm-612-kmod/pkg-plist b/graphics/drm-612-kmod/pkg-plist
new file mode 100644
index 000000000000..79c8a2a04c13
--- /dev/null
+++ b/graphics/drm-612-kmod/pkg-plist
@@ -0,0 +1,6 @@
+/%%KMODDIR%%/dmabuf.ko
+/%%KMODDIR%%/amdgpu.ko
+/%%KMODDIR%%/drm.ko
+/%%KMODDIR%%/i915kms.ko
+/%%KMODDIR%%/radeonkms.ko
+/%%KMODDIR%%/ttm.ko
diff --git a/graphics/drm-66-kmod/Makefile b/graphics/drm-66-kmod/Makefile
index ec0cacd0d710..513faee5b294 100644
--- a/graphics/drm-66-kmod/Makefile
+++ b/graphics/drm-66-kmod/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	graphics kld
 .include "Makefile.version"
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	Direct Rendering Manager GPU drivers
+COMMENT=	Direct Rendering Manager (DRM) GPU drivers
 WWW=		https://github.com/freebsd/drm-kmod/
 
 LICENSE=	BSD2CLAUSE MIT GPLv2
@@ -15,8 +15,10 @@ LICENSE_COMB=	multi
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64
 
-CONFLICTS_INSTALL=	drm-515-kmod \
-			drm-61-kmod
+CONFLICTS_INSTALL=	drm-latest-kmod \
+			drm-515-kmod \
+			drm-61-kmod \
+			drm-612-kmod
 
 USES=		kmod uidfix compiler:c++11-lang
 
diff --git a/graphics/drm-kmod/Makefile b/graphics/drm-kmod/Makefile
index d2b8794f4d53..96a895329baf 100644
--- a/graphics/drm-kmod/Makefile
+++ b/graphics/drm-kmod/Makefile
@@ -1,10 +1,9 @@
 PORTNAME=	drm-kmod
-PORTVERSION=	20250428
-PORTREVISION=	1
+PORTVERSION=	20260508
 CATEGORIES=	graphics
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	Direct Rendering Manager GPU drivers metaport
+COMMENT=	Direct Rendering Manager (DRM) GPU drivers metaport
 WWW=		https://github.com/freebsd/drm-kmod
 
 USES=		metaport
@@ -16,7 +15,10 @@ RUN_DEPENDS=	gpu-firmware-kmod>=20220511:graphics/gpu-firmware-kmod
 .if ${OPSYS} != FreeBSD
 IGNORE=		not supported on anything but FreeBSD (missing linuxkpi functionality)
 .else
-.  if ${OSVERSION} >= 1500031 && ${ARCH} == amd64
+.  if ${OSVERSION} >= 1500509 && ${ARCH} == amd64
+RUN_DEPENDS+=	${KMODDIR}/drm.ko:graphics/drm-612-kmod
+_DRM_ARCHS=	amd64
+.  elif ${OSVERSION} >= 1500031 && ${ARCH} == amd64
 RUN_DEPENDS+=	${KMODDIR}/drm.ko:graphics/drm-66-kmod
 _DRM_ARCHS=	amd64
 .  else
diff --git a/graphics/drm-latest-kmod/Makefile b/graphics/drm-latest-kmod/Makefile
index 0eaf192a138a..15edfb27d28b 100644
--- a/graphics/drm-latest-kmod/Makefile
+++ b/graphics/drm-latest-kmod/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	graphics kld
 .include "Makefile.version"
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	DRM drivers modules
+COMMENT=	Direct Rendering Manager (DRM) GPU drivers
 WWW=		https://github.com/freebsd/drm-kmod/
 
 LICENSE=	BSD2CLAUSE MIT GPLv2
@@ -15,7 +15,9 @@ ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	the new KMS components are only supported on amd64
 
 CONFLICTS_INSTALL=	drm-515-kmod \
-			drm-61-kmod
+			drm-61-kmod \
+			drm-66-kmod \
+			drm-612-kmod
 
 USES=		kmod uidfix compiler:c++11-lang