Date: Sat, 30 May 2026 05:32:52 +0000 From: Kevin Bowling <kbowling@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Tomoaki AOKI <junchoon@dec.sakura.ne.jp> Subject: git: 536352bd7c13 - main - graphics/nvidia-drm-*-kmod: Add drm 6.12 Message-ID: <6a1a7684.43c1e.3747b792@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=536352bd7c13b49c985d0e07474d7258ba793fbe commit 536352bd7c13b49c985d0e07474d7258ba793fbe Author: Tomoaki AOKI <junchoon@dec.sakura.ne.jp> AuthorDate: 2026-05-30 04:46:42 +0000 Commit: Kevin Bowling <kbowling@FreeBSD.org> CommitDate: 2026-05-30 05:31:42 +0000 graphics/nvidia-drm-*-kmod: Add drm 6.12 Add new ports graphics/nvidia-drm-612-kmod, graphics/nvidia-drm-612-kmod-580 and graphics/nvidia-drm-612-kmod-devel and add conflicts to graphics/nvidia-drm-{515|61|66|latest}-kmod{-580|-devel} following the addition of graphics/drm-612-kmod. While here, bump graphics/nvidia-drm-latest-kmod, graphics/nvidia-drm-latest-kmod-580 and graphics/nvidia-drm-latest-kmod-devel following the bump of graphics/drm-latest-kmod from 6.9 to 6.12. Bump PORTREVISION of other graphics/nvidia-drm-*-kmod* as of changes in CONFLICTS. Match DRM driver version selection with graphics/drm-kmod. Now 6.12 is default for OSVERSION >= 1500509 (stable/15, upcoming 15.1 and main) when installed using graphics/nvidia-drm-kmod{-580|-devel} ports / pkgs. PR: 295519 Differential Revision: https://reviews.freebsd.org/D57206 --- graphics/Makefile | 3 ++ graphics/nvidia-drm-515-kmod-580/Makefile | 2 +- graphics/nvidia-drm-515-kmod-devel/Makefile | 2 +- graphics/nvidia-drm-515-kmod/Makefile | 4 +- graphics/nvidia-drm-61-kmod-580/Makefile | 2 +- graphics/nvidia-drm-61-kmod-devel/Makefile | 2 +- graphics/nvidia-drm-61-kmod/Makefile | 4 +- graphics/nvidia-drm-612-kmod-580/Makefile | 7 +++ graphics/nvidia-drm-612-kmod-580/distinfo | 5 ++ graphics/nvidia-drm-612-kmod-devel/Makefile | 7 +++ graphics/nvidia-drm-612-kmod-devel/distinfo | 5 ++ graphics/nvidia-drm-612-kmod/Makefile | 11 +++++ graphics/nvidia-drm-612-kmod/distinfo | 5 ++ .../files/20-nvidia-drm-outputclass.conf.in | 8 ++++ .../files/extra-patch-nvidia-drm-conftest.h | 14 ++++++ .../files/extra-patch-nvidia-drm-freebsd-lkpi.c | 54 ++++++++++++++++++++++ ...tra-patch-nvidia-drm-freebsd-lkpi.c-20250918-01 | 47 +++++++++++++++++++ graphics/nvidia-drm-612-kmod/pkg-descr | 3 ++ graphics/nvidia-drm-612-kmod/pkg-message | 8 ++++ graphics/nvidia-drm-66-kmod-580/Makefile | 2 +- graphics/nvidia-drm-66-kmod-devel/Makefile | 2 +- graphics/nvidia-drm-66-kmod/Makefile | 4 +- graphics/nvidia-drm-kmod-580/Makefile | 2 +- graphics/nvidia-drm-kmod-devel/Makefile | 2 +- graphics/nvidia-drm-kmod/Makefile | 6 ++- graphics/nvidia-drm-latest-kmod-580/Makefile | 2 +- graphics/nvidia-drm-latest-kmod-580/distinfo | 6 +-- graphics/nvidia-drm-latest-kmod-devel/Makefile | 2 +- graphics/nvidia-drm-latest-kmod-devel/distinfo | 6 +-- graphics/nvidia-drm-latest-kmod/Makefile | 4 +- graphics/nvidia-drm-latest-kmod/distinfo | 6 +-- graphics/nvidia-drm-latest-kmod/pkg-descr | 2 +- 32 files changed, 209 insertions(+), 30 deletions(-) diff --git a/graphics/Makefile b/graphics/Makefile index 2376949bed2b..ef83f482e525 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -644,6 +644,9 @@ SUBDIR += nvidia-drm-66-kmod SUBDIR += nvidia-drm-66-kmod-580 SUBDIR += nvidia-drm-66-kmod-devel + SUBDIR += nvidia-drm-612-kmod + SUBDIR += nvidia-drm-612-kmod-580 + SUBDIR += nvidia-drm-612-kmod-devel SUBDIR += nvidia-drm-kmod SUBDIR += nvidia-drm-kmod-580 SUBDIR += nvidia-drm-kmod-devel diff --git a/graphics/nvidia-drm-515-kmod-580/Makefile b/graphics/nvidia-drm-515-kmod-580/Makefile index 334f8c2d1860..e418e97dc668 100644 --- a/graphics/nvidia-drm-515-kmod-580/Makefile +++ b/graphics/nvidia-drm-515-kmod-580/Makefile @@ -1,6 +1,6 @@ NVIDIA_DISTVERSION?= 580.159.04 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 0 +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../nvidia-drm-515-kmod PKGNAMESUFFIX= -580 diff --git a/graphics/nvidia-drm-515-kmod-devel/Makefile b/graphics/nvidia-drm-515-kmod-devel/Makefile index b20c059aace9..52d6826a82c3 100644 --- a/graphics/nvidia-drm-515-kmod-devel/Makefile +++ b/graphics/nvidia-drm-515-kmod-devel/Makefile @@ -1,6 +1,6 @@ NVIDIA_DISTVERSION?= 595.71.05 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 0 +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../nvidia-drm-515-kmod PKGNAMESUFFIX= -devel diff --git a/graphics/nvidia-drm-515-kmod/Makefile b/graphics/nvidia-drm-515-kmod/Makefile index d4355174953a..fc5f1f0fbdc2 100644 --- a/graphics/nvidia-drm-515-kmod/Makefile +++ b/graphics/nvidia-drm-515-kmod/Makefile @@ -1,9 +1,9 @@ PORTNAME= nvidia-drm-515-kmod -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-515-kmod -CONFLICTS_INSTALL= nvidia-drm-61-kmod* nvidia-drm-66-kmod* +CONFLICTS_INSTALL= nvidia-drm-61-kmod* nvidia-drm-66-kmod* nvidia-drm-612-kmod* nvidia-drm-latest-kmod* .include "${.CURDIR}/../drm-515-kmod/Makefile.version" .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common" diff --git a/graphics/nvidia-drm-61-kmod-580/Makefile b/graphics/nvidia-drm-61-kmod-580/Makefile index f13e95405295..d2534145932d 100644 --- a/graphics/nvidia-drm-61-kmod-580/Makefile +++ b/graphics/nvidia-drm-61-kmod-580/Makefile @@ -1,6 +1,6 @@ NVIDIA_DISTVERSION?= 580.159.04 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 0 +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../nvidia-drm-61-kmod PKGNAMESUFFIX= -580 diff --git a/graphics/nvidia-drm-61-kmod-devel/Makefile b/graphics/nvidia-drm-61-kmod-devel/Makefile index 197b4cb2c13e..c83c408aa58d 100644 --- a/graphics/nvidia-drm-61-kmod-devel/Makefile +++ b/graphics/nvidia-drm-61-kmod-devel/Makefile @@ -1,6 +1,6 @@ NVIDIA_DISTVERSION?= 595.71.05 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 0 +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../nvidia-drm-61-kmod PKGNAMESUFFIX= -devel diff --git a/graphics/nvidia-drm-61-kmod/Makefile b/graphics/nvidia-drm-61-kmod/Makefile index 28680a3436ed..0ff6e9ca78d2 100644 --- a/graphics/nvidia-drm-61-kmod/Makefile +++ b/graphics/nvidia-drm-61-kmod/Makefile @@ -1,9 +1,9 @@ PORTNAME= nvidia-drm-61-kmod -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-61-kmod -CONFLICTS_INSTALL= nvidia-drm-515-kmod* nvidia-drm-66-kmod* +CONFLICTS_INSTALL= nvidia-drm-515-kmod* nvidia-drm-66-kmod* nvidia-drm-612-kmod* nvidia-drm-latest-kmod* .include "${.CURDIR}/../drm-61-kmod/Makefile.version" .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common" diff --git a/graphics/nvidia-drm-612-kmod-580/Makefile b/graphics/nvidia-drm-612-kmod-580/Makefile new file mode 100644 index 000000000000..e6ca7550cb69 --- /dev/null +++ b/graphics/nvidia-drm-612-kmod-580/Makefile @@ -0,0 +1,7 @@ +NVIDIA_DISTVERSION?= 580.159.04 +# Explicitly set PORTREVISION as it can be overridden by the master port +PORTREVISION= 0 +MASTERDIR= ${.CURDIR}/../nvidia-drm-612-kmod +PKGNAMESUFFIX= -580 + +.include "${MASTERDIR}/Makefile" diff --git a/graphics/nvidia-drm-612-kmod-580/distinfo b/graphics/nvidia-drm-612-kmod-580/distinfo new file mode 100644 index 000000000000..28fc9ec5466e --- /dev/null +++ b/graphics/nvidia-drm-612-kmod-580/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1779519999 +SHA256 (NVIDIA-FreeBSD-x86_64-580.159.04.tar.xz) = 658a163d482fa999404ecd5033aba6976f70544daf6f02953408efcd3be6e224 +SIZE (NVIDIA-FreeBSD-x86_64-580.159.04.tar.xz) = 289159328 +SHA256 (freebsd-drm-kmod-drm_v6.12.85_1_GH0.tar.gz) = 418b81a5d83f269ecb6ac3cdab663684614df07ce87d65ebdab74889c0d6be9e +SIZE (freebsd-drm-kmod-drm_v6.12.85_1_GH0.tar.gz) = 44075974 diff --git a/graphics/nvidia-drm-612-kmod-devel/Makefile b/graphics/nvidia-drm-612-kmod-devel/Makefile new file mode 100644 index 000000000000..7012470c3b7a --- /dev/null +++ b/graphics/nvidia-drm-612-kmod-devel/Makefile @@ -0,0 +1,7 @@ +NVIDIA_DISTVERSION?= 595.71.05 +# Explicitly set PORTREVISION as it can be overridden by the master port +PORTREVISION= 0 +MASTERDIR= ${.CURDIR}/../nvidia-drm-612-kmod +PKGNAMESUFFIX= -devel + +.include "${MASTERDIR}/Makefile" diff --git a/graphics/nvidia-drm-612-kmod-devel/distinfo b/graphics/nvidia-drm-612-kmod-devel/distinfo new file mode 100644 index 000000000000..466025ab9f87 --- /dev/null +++ b/graphics/nvidia-drm-612-kmod-devel/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1779520072 +SHA256 (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 690ea1fed7b4310e5a6977738eb51a27593aa1ebf6e50a5853f1bedfccc782cf +SIZE (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 328170544 +SHA256 (freebsd-drm-kmod-drm_v6.12.85_1_GH0.tar.gz) = 418b81a5d83f269ecb6ac3cdab663684614df07ce87d65ebdab74889c0d6be9e +SIZE (freebsd-drm-kmod-drm_v6.12.85_1_GH0.tar.gz) = 44075974 diff --git a/graphics/nvidia-drm-612-kmod/Makefile b/graphics/nvidia-drm-612-kmod/Makefile new file mode 100644 index 000000000000..1467c5ad5ed4 --- /dev/null +++ b/graphics/nvidia-drm-612-kmod/Makefile @@ -0,0 +1,11 @@ +PORTNAME= nvidia-drm-612-kmod +PORTREVISION= 0 +CATEGORIES= graphics + +RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-612-kmod +CONFLICTS_INSTALL= nvidia-drm-515-kmod* nvidia-drm-61-kmod* nvidia-drm-66-kmod* nvidia-drm-latest-kmod* + +.include "${.CURDIR}/../drm-612-kmod/Makefile.version" +.include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common" + +.include <bsd.port.mk> diff --git a/graphics/nvidia-drm-612-kmod/distinfo b/graphics/nvidia-drm-612-kmod/distinfo new file mode 100644 index 000000000000..c456516e8224 --- /dev/null +++ b/graphics/nvidia-drm-612-kmod/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1779519984 +SHA256 (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 690ea1fed7b4310e5a6977738eb51a27593aa1ebf6e50a5853f1bedfccc782cf +SIZE (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 328170544 +SHA256 (freebsd-drm-kmod-drm_v6.12.85_1_GH0.tar.gz) = 418b81a5d83f269ecb6ac3cdab663684614df07ce87d65ebdab74889c0d6be9e +SIZE (freebsd-drm-kmod-drm_v6.12.85_1_GH0.tar.gz) = 44075974 diff --git a/graphics/nvidia-drm-612-kmod/files/20-nvidia-drm-outputclass.conf.in b/graphics/nvidia-drm-612-kmod/files/20-nvidia-drm-outputclass.conf.in new file mode 100644 index 000000000000..15496138f63a --- /dev/null +++ b/graphics/nvidia-drm-612-kmod/files/20-nvidia-drm-outputclass.conf.in @@ -0,0 +1,8 @@ +Section "OutputClass" + Identifier "nvidia" + MatchDriver "nvidia-drm" + Driver "nvidia" + Option "PrimaryGPU" "yes" + ModulePath "%%LOCALBASE%%/lib/nvidia/xorg" + ModulePath "%%LOCALBASE%%/lib/xorg/modules" +EndSection diff --git a/graphics/nvidia-drm-612-kmod/files/extra-patch-nvidia-drm-conftest.h b/graphics/nvidia-drm-612-kmod/files/extra-patch-nvidia-drm-conftest.h new file mode 100644 index 000000000000..2c0524341c4d --- /dev/null +++ b/graphics/nvidia-drm-612-kmod/files/extra-patch-nvidia-drm-conftest.h @@ -0,0 +1,14 @@ +--- nvidia-drm-conftest.h.orig 2024-02-22 01:03:15 UTC ++++ nvidia-drm-conftest.h +@@ -85,7 +85,11 @@ + + /* For nv_drm_gem_prime_force_fence_signal */ + #ifndef spin_is_locked ++#if ((__FreeBSD_version >= 1500000) && (__FreeBSD_version < 1500018)) || (__FreeBSD_version < 1401501) + #define spin_is_locked(lock) mtx_owned(lock.m) ++#else ++#define spin_is_locked(lock) mtx_owned(lock) ++#endif + #endif + + #ifndef rwsem_is_locked diff --git a/graphics/nvidia-drm-612-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c b/graphics/nvidia-drm-612-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c new file mode 100644 index 000000000000..807e95effe74 --- /dev/null +++ b/graphics/nvidia-drm-612-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c @@ -0,0 +1,54 @@ +--- nvidia-drm-freebsd-lkpi.c.orig 2024-02-22 01:03:15 UTC ++++ nvidia-drm-freebsd-lkpi.c +@@ -115,6 +115,7 @@ int nv_drm_probe_devices(void) + * by the native nvidia.ko by using our devclass. + */ + for (int i = 0; i < NV_MAX_DEVICES; i++) { ++ struct pci_dev *pdev; + nv_gpu_info_t gpu_info; + struct nvidia_softc *sc = devclass_get_softc(nvidia_devclass, i); + if (!sc) { +@@ -124,11 +125,33 @@ int nv_drm_probe_devices(void) + nv_state_t *nv = sc->nv_state; + + /* ++ * Set the ivars for this device if they are not already populated. This ++ * is the bus specific data, and linuxkpi will try to use it. ++ */ ++ if (!device_get_ivars(sc->dev)) { ++ device_t parent = device_get_parent(sc->dev); ++ struct pci_devinfo *dinfo = device_get_ivars(parent); ++ device_set_ivars(sc->dev, dinfo); ++ } ++ ++ /* + * Now we have the state (which gives us the device_t), but what nvidia-drm + * wants is a pci_dev suitable for use with linuxkpi code. We can use +- * lkpinew_pci_dev to fill in a pci_dev struct, ++ * lkpinew_pci_dev to fill in a pci_dev struct, or linux_pci_attach on more ++ * recent kernels (introduced by 253dbe7487705). + */ +- struct pci_dev *pdev = lkpinew_pci_dev(sc->dev); ++#if __FreeBSD_version < 1300093 ++ pdev = lkpinew_pci_dev(sc->dev); ++#else ++ pdev = malloc(sizeof(*pdev), M_DEVBUF, M_WAITOK|M_ZERO); ++ if (!pdev) { ++ return -ENOMEM; ++ } ++ ++ if (linux_pci_attach_device(sc->dev, NULL, NULL, pdev)) { ++ return -ENOMEM; ++ } ++#endif + nv_lkpi_pci_devs[i] = pdev; + + gpu_info.gpu_id = nv->gpu_id; +@@ -148,7 +171,6 @@ MODULE_DEPEND(nvidia_drm, linuxkpi, 1, 1, 1); + LKPI_DRIVER_MODULE(nvidia_drm, nv_drm_init, nv_drm_exit); + LKPI_PNP_INFO(pci, nvidia_drm, nv_module_device_table); + MODULE_DEPEND(nvidia_drm, linuxkpi, 1, 1, 1); +-MODULE_DEPEND(nvidia_drm, linuxkpi_gplv2, 1, 1, 1); + MODULE_DEPEND(nvidia_drm, drmn, 2, 2, 2); + MODULE_DEPEND(nvidia_drm, dmabuf, 1, 1, 1); + MODULE_DEPEND(nvidia_drm, nvidia, 1, 1, 1); diff --git a/graphics/nvidia-drm-612-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c-20250918-01 b/graphics/nvidia-drm-612-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c-20250918-01 new file mode 100644 index 000000000000..c703950a0c88 --- /dev/null +++ b/graphics/nvidia-drm-612-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c-20250918-01 @@ -0,0 +1,47 @@ +--- nvidia-drm-freebsd-lkpi.c.orig 2025-08-27 17:59:14 UTC ++++ nvidia-drm-freebsd-lkpi.c +@@ -104,6 +104,35 @@ lkpinew_pci_dev(device_t dev) + * FreeBSD linuxkpi based loading support code. + *************************************************************************/ + ++static int ++dummy_nv_pci_probe(struct pci_dev *pci_dev __unused, ++ const struct pci_device_id *id_table __unused) ++{ ++ return (0); ++} ++ ++static void ++dummy_nv_pci_remove(struct pci_dev *pci_dev __unused) ++{ ++} ++ ++static void ++dummy_nv_pci_shutdown(struct pci_dev *pci_dev __unused) ++{ ++} ++ ++struct pci_driver nv_pci_driver = { ++ .name = "drmn", ++ .id_table = nv_pci_table, ++ .probe = dummy_nv_pci_probe, ++ .remove = dummy_nv_pci_remove, ++ .shutdown = dummy_nv_pci_shutdown, ++#if defined(__FreeBSD__) ++ /* FreeBSD internal/specifc. */ ++ .isdrm = true, ++#endif ++}; ++ + static struct pci_dev *nv_lkpi_pci_devs[NV_MAX_DEVICES]; + + int nv_drm_probe_devices(void) +@@ -153,7 +182,7 @@ int nv_drm_probe_devices(void) + return -ENOMEM; + } + +- if (linux_pci_attach_device(sc->dev, NULL, NULL, pdev)) { ++ if (linux_pci_attach_device(sc->dev, &nv_pci_driver, NULL, pdev)) { + NV_DRM_LOG_ERR("Failed to attach linuxkpi PCI device"); + free(pdev, M_DEVBUF); + return -ENOMEM; diff --git a/graphics/nvidia-drm-612-kmod/pkg-descr b/graphics/nvidia-drm-612-kmod/pkg-descr new file mode 100644 index 000000000000..b35cceeec3cd --- /dev/null +++ b/graphics/nvidia-drm-612-kmod/pkg-descr @@ -0,0 +1,3 @@ +FreeBSD port of Linux's nvidia-drm.ko Kernel module. + +This version is compatible with drm.ko 6.12. diff --git a/graphics/nvidia-drm-612-kmod/pkg-message b/graphics/nvidia-drm-612-kmod/pkg-message new file mode 100644 index 000000000000..c2440d5580aa --- /dev/null +++ b/graphics/nvidia-drm-612-kmod/pkg-message @@ -0,0 +1,8 @@ +Modesetting must be enabled to use nvidia-drm.ko for graphics. This can be done +by setting the modeset sysctl, the equivalent of the modeset kernel parameter +on Linux. + +hw.nvidiadrm.modeset=1 + +This must be set before loading nvidia-drm.ko, most easily done by placing the +above in /boot/loader.conf. diff --git a/graphics/nvidia-drm-66-kmod-580/Makefile b/graphics/nvidia-drm-66-kmod-580/Makefile index bf58ac630084..babf2c16c729 100644 --- a/graphics/nvidia-drm-66-kmod-580/Makefile +++ b/graphics/nvidia-drm-66-kmod-580/Makefile @@ -1,6 +1,6 @@ NVIDIA_DISTVERSION?= 580.159.04 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 0 +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../nvidia-drm-66-kmod PKGNAMESUFFIX= -580 diff --git a/graphics/nvidia-drm-66-kmod-devel/Makefile b/graphics/nvidia-drm-66-kmod-devel/Makefile index a14471655724..98291f73863c 100644 --- a/graphics/nvidia-drm-66-kmod-devel/Makefile +++ b/graphics/nvidia-drm-66-kmod-devel/Makefile @@ -1,6 +1,6 @@ NVIDIA_DISTVERSION?= 595.71.05 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 0 +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../nvidia-drm-66-kmod PKGNAMESUFFIX= -devel diff --git a/graphics/nvidia-drm-66-kmod/Makefile b/graphics/nvidia-drm-66-kmod/Makefile index f5af2c65fcbb..55a9e2aaef7a 100644 --- a/graphics/nvidia-drm-66-kmod/Makefile +++ b/graphics/nvidia-drm-66-kmod/Makefile @@ -1,9 +1,9 @@ PORTNAME= nvidia-drm-66-kmod -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-66-kmod -CONFLICTS_INSTALL= nvidia-drm-515-kmod* nvidia-drm-61-kmod* +CONFLICTS_INSTALL= nvidia-drm-515-kmod* nvidia-drm-61-kmod* nvidia-drm-612-kmod* nvidia-drm-latest-kmod* .include "${.CURDIR}/../drm-66-kmod/Makefile.version" .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common" diff --git a/graphics/nvidia-drm-kmod-580/Makefile b/graphics/nvidia-drm-kmod-580/Makefile index 84ffaadf7a88..3301c6df1e03 100644 --- a/graphics/nvidia-drm-kmod-580/Makefile +++ b/graphics/nvidia-drm-kmod-580/Makefile @@ -1,6 +1,6 @@ DISTVERSION?= 580.159.04 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 0 +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../nvidia-drm-kmod PKGNAMESUFFIX= -580 diff --git a/graphics/nvidia-drm-kmod-devel/Makefile b/graphics/nvidia-drm-kmod-devel/Makefile index d2c6a6e74775..ab6513568c27 100644 --- a/graphics/nvidia-drm-kmod-devel/Makefile +++ b/graphics/nvidia-drm-kmod-devel/Makefile @@ -1,6 +1,6 @@ DISTVERSION?= 595.71.05 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 0 +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../nvidia-drm-kmod PKGNAMESUFFIX= -devel diff --git a/graphics/nvidia-drm-kmod/Makefile b/graphics/nvidia-drm-kmod/Makefile index 99693bb3a410..b932752aaffa 100644 --- a/graphics/nvidia-drm-kmod/Makefile +++ b/graphics/nvidia-drm-kmod/Makefile @@ -1,6 +1,6 @@ PORTNAME= nvidia-drm-kmod DISTVERSION?= ${NVIDIA_DISTVERSION} -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= graphics kld MAINTAINER= x11@FreeBSD.org @@ -15,7 +15,9 @@ USES= metaport .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}/nvidia-drm.ko:graphics/nvidia-drm-612-kmod${PKGNAMESUFFIX} +. elif ${OSVERSION} >= 1500031 && ${ARCH} == amd64 RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-66-kmod${PKGNAMESUFFIX} . else RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-61-kmod${PKGNAMESUFFIX} diff --git a/graphics/nvidia-drm-latest-kmod-580/Makefile b/graphics/nvidia-drm-latest-kmod-580/Makefile index 486d9c52d8c3..0ba4a3131682 100644 --- a/graphics/nvidia-drm-latest-kmod-580/Makefile +++ b/graphics/nvidia-drm-latest-kmod-580/Makefile @@ -1,6 +1,6 @@ NVIDIA_DISTVERSION?= 580.159.04 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 0 +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../nvidia-drm-latest-kmod PKGNAMESUFFIX= -580 diff --git a/graphics/nvidia-drm-latest-kmod-580/distinfo b/graphics/nvidia-drm-latest-kmod-580/distinfo index 6a07cc7f7b72..937c689354c7 100644 --- a/graphics/nvidia-drm-latest-kmod-580/distinfo +++ b/graphics/nvidia-drm-latest-kmod-580/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1779341303 +TIMESTAMP = 1779520216 SHA256 (NVIDIA-FreeBSD-x86_64-580.159.04.tar.xz) = 658a163d482fa999404ecd5033aba6976f70544daf6f02953408efcd3be6e224 SIZE (NVIDIA-FreeBSD-x86_64-580.159.04.tar.xz) = 289159328 -SHA256 (freebsd-drm-kmod-drm_v6.9_1_GH0.tar.gz) = df7933202e61ebf8c9decb6835e4908817923fe4e76213e532873b0b611e8c63 -SIZE (freebsd-drm-kmod-drm_v6.9_1_GH0.tar.gz) = 41512758 +SHA256 (freebsd-drm-kmod-drm_v6.12_GH0.tar.gz) = d14ee33f3ff5e32aa0d1dffa43a27d93b2083ec9c4216508b29cf4c519ffc5df +SIZE (freebsd-drm-kmod-drm_v6.12_GH0.tar.gz) = 44013275 diff --git a/graphics/nvidia-drm-latest-kmod-devel/Makefile b/graphics/nvidia-drm-latest-kmod-devel/Makefile index 9eeb42e62d11..3092618cf50e 100644 --- a/graphics/nvidia-drm-latest-kmod-devel/Makefile +++ b/graphics/nvidia-drm-latest-kmod-devel/Makefile @@ -1,6 +1,6 @@ NVIDIA_DISTVERSION?= 595.71.05 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 0 +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../nvidia-drm-latest-kmod PKGNAMESUFFIX= -devel diff --git a/graphics/nvidia-drm-latest-kmod-devel/distinfo b/graphics/nvidia-drm-latest-kmod-devel/distinfo index a32b777a523a..8582b9651153 100644 --- a/graphics/nvidia-drm-latest-kmod-devel/distinfo +++ b/graphics/nvidia-drm-latest-kmod-devel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1777389791 +TIMESTAMP = 1779520226 SHA256 (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 690ea1fed7b4310e5a6977738eb51a27593aa1ebf6e50a5853f1bedfccc782cf SIZE (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 328170544 -SHA256 (freebsd-drm-kmod-drm_v6.9_1_GH0.tar.gz) = df7933202e61ebf8c9decb6835e4908817923fe4e76213e532873b0b611e8c63 -SIZE (freebsd-drm-kmod-drm_v6.9_1_GH0.tar.gz) = 41512758 +SHA256 (freebsd-drm-kmod-drm_v6.12_GH0.tar.gz) = d14ee33f3ff5e32aa0d1dffa43a27d93b2083ec9c4216508b29cf4c519ffc5df +SIZE (freebsd-drm-kmod-drm_v6.12_GH0.tar.gz) = 44013275 diff --git a/graphics/nvidia-drm-latest-kmod/Makefile b/graphics/nvidia-drm-latest-kmod/Makefile index db2da73e60a0..67bca41228f5 100644 --- a/graphics/nvidia-drm-latest-kmod/Makefile +++ b/graphics/nvidia-drm-latest-kmod/Makefile @@ -1,9 +1,9 @@ PORTNAME= nvidia-drm-latest-kmod -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-latest-kmod -CONFLICTS_INSTALL= nvidia-drm-515-kmod* nvidia-drm-61-kmod* nvidia-drm-66-kmod* +CONFLICTS_INSTALL= nvidia-drm-515-kmod* nvidia-drm-61-kmod* nvidia-drm-66-kmod* nvidia-drm-612-kmod* .include "${.CURDIR}/../drm-latest-kmod/Makefile.version" .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common" diff --git a/graphics/nvidia-drm-latest-kmod/distinfo b/graphics/nvidia-drm-latest-kmod/distinfo index a32b777a523a..a1dcbc31db50 100644 --- a/graphics/nvidia-drm-latest-kmod/distinfo +++ b/graphics/nvidia-drm-latest-kmod/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1777389791 +TIMESTAMP = 1779520151 SHA256 (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 690ea1fed7b4310e5a6977738eb51a27593aa1ebf6e50a5853f1bedfccc782cf SIZE (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 328170544 -SHA256 (freebsd-drm-kmod-drm_v6.9_1_GH0.tar.gz) = df7933202e61ebf8c9decb6835e4908817923fe4e76213e532873b0b611e8c63 -SIZE (freebsd-drm-kmod-drm_v6.9_1_GH0.tar.gz) = 41512758 +SHA256 (freebsd-drm-kmod-drm_v6.12_GH0.tar.gz) = d14ee33f3ff5e32aa0d1dffa43a27d93b2083ec9c4216508b29cf4c519ffc5df +SIZE (freebsd-drm-kmod-drm_v6.12_GH0.tar.gz) = 44013275 diff --git a/graphics/nvidia-drm-latest-kmod/pkg-descr b/graphics/nvidia-drm-latest-kmod/pkg-descr index 7a6433279b02..b35cceeec3cd 100644 --- a/graphics/nvidia-drm-latest-kmod/pkg-descr +++ b/graphics/nvidia-drm-latest-kmod/pkg-descr @@ -1,3 +1,3 @@ FreeBSD port of Linux's nvidia-drm.ko Kernel module. -This version is compatible with drm.ko 6.9. +This version is compatible with drm.ko 6.12.home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a1a7684.43c1e.3747b792>