x11/nvidia-driver, linux-nvidia-libs, nvidia-drm: Update to 550.127.05

Approved by:	blanket, Austin Shafer <ashafer@badland.io>
PR:		282312
This commit is contained in:
Tomoaki AOKI 2024-10-29 11:24:07 -07:00 committed by Kevin Bowling
parent a6250ad195
commit 4d5697a502
11 changed files with 47 additions and 17 deletions

View file

@ -1,5 +1,5 @@
TIMESTAMP = 1727593803 TIMESTAMP = 1729779540
SHA256 (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 9e2bb3dc93be5da6abe0c78621120e71dfcc0973577c9e63386e9a582501147e SHA256 (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3
SIZE (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 143460952 SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432
SHA256 (freebsd-drm-kmod-drm_v5.10.163_7_GH0.tar.gz) = dbdff8ad8cad8152d1c286b058f1f5114b3672f1a936e13933ce52915b77eaaa SHA256 (freebsd-drm-kmod-drm_v5.10.163_7_GH0.tar.gz) = dbdff8ad8cad8152d1c286b058f1f5114b3672f1a936e13933ce52915b77eaaa
SIZE (freebsd-drm-kmod-drm_v5.10.163_7_GH0.tar.gz) = 20095338 SIZE (freebsd-drm-kmod-drm_v5.10.163_7_GH0.tar.gz) = 20095338

View file

@ -1,5 +1,5 @@
TIMESTAMP = 1729926280 TIMESTAMP = 1729926280
SHA256 (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 9e2bb3dc93be5da6abe0c78621120e71dfcc0973577c9e63386e9a582501147e SHA256 (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3
SIZE (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 143460952 SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432
SHA256 (freebsd-drm-kmod-drm_v5.15.160_1_GH0.tar.gz) = b48e104c3437ac6e8a58e734fe943281f43b31d9327d50457bb26d8a2106bf64 SHA256 (freebsd-drm-kmod-drm_v5.15.160_1_GH0.tar.gz) = b48e104c3437ac6e8a58e734fe943281f43b31d9327d50457bb26d8a2106bf64
SIZE (freebsd-drm-kmod-drm_v5.15.160_1_GH0.tar.gz) = 26098489 SIZE (freebsd-drm-kmod-drm_v5.15.160_1_GH0.tar.gz) = 26098489

View file

@ -1,5 +1,5 @@
TIMESTAMP = 1729926563 TIMESTAMP = 1729926563
SHA256 (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 9e2bb3dc93be5da6abe0c78621120e71dfcc0973577c9e63386e9a582501147e SHA256 (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3
SIZE (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 143460952 SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432
SHA256 (freebsd-drm-kmod-drm_v6.1.92_2_GH0.tar.gz) = 0c28dc918dc16a103ac93ec8f7521145115e24f7c462595ce4433e1769708122 SHA256 (freebsd-drm-kmod-drm_v6.1.92_2_GH0.tar.gz) = 0c28dc918dc16a103ac93ec8f7521145115e24f7c462595ce4433e1769708122
SIZE (freebsd-drm-kmod-drm_v6.1.92_2_GH0.tar.gz) = 37101285 SIZE (freebsd-drm-kmod-drm_v6.1.92_2_GH0.tar.gz) = 37101285

View file

@ -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

View file

@ -30,6 +30,10 @@ MAKE_ENV+= DEBUG_FLAGS=${DEBUG_FLAGS} \
WRKSRC= ${WRKDIR}/NVIDIA-FreeBSD-${ARCH_SUFX}-${NVIDIA_DISTVERSION}/ WRKSRC= ${WRKDIR}/NVIDIA-FreeBSD-${ARCH_SUFX}-${NVIDIA_DISTVERSION}/
WRKSRC_SUBDIR= src/nvidia-drm/ WRKSRC_SUBDIR= src/nvidia-drm/
.if ${NVVERSION} < 565.00000
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nvidia-drm-conftest.h
.endif #565.00
.if ${NVVERSION} < 555.04202 .if ${NVVERSION} < 555.04202
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nvidia-drm-freebsd-lkpi.c EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nvidia-drm-freebsd-lkpi.c
.endif .endif
@ -39,6 +43,9 @@ post-install:
${INSTALL_DATA} ${WRKDIR}/20-nvidia-drm-outputclass.conf ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d/ ${INSTALL_DATA} ${WRKDIR}/20-nvidia-drm-outputclass.conf ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d/
post-patch: post-patch:
# Workaround for LLVM/Clang19
${REINPLACE_CMD} -e '/DRMKMODDIR.*\/linuxkpi\/dummy\/include/d' \
${WRKSRC}/Makefile
# We should support -CURRENT: kill the check (first #if __FreeBSD_version) # We should support -CURRENT: kill the check (first #if __FreeBSD_version)
linenum=$$(${SED} -ne '/^#if __FreeBSD_version/ { = ; q ; }' \ linenum=$$(${SED} -ne '/^#if __FreeBSD_version/ { = ; q ; }' \
${WRKSRC}/../nvidia/nv-freebsd.h) ; ${REINPLACE_CMD} \ ${WRKSRC}/../nvidia/nv-freebsd.h) ; ${REINPLACE_CMD} \

View file

@ -129,7 +129,11 @@ LINUX32_LIBS+= libnvidia-compiler.so.${PORTVERSION}
.endif .endif
.if ${NVVERSION} >= 550.00000 # 550.00 .if ${NVVERSION} >= 565.00000 # 565.00
LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.17
LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.17 libnvidia-egl-wayland.so.1
PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.17/'
.elif ${NVVERSION} >= 550.00000 # 550.00
LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.13 LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.13
LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.13 libnvidia-egl-wayland.so.1 LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.13 libnvidia-egl-wayland.so.1
PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.13/' PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.13/'
@ -290,7 +294,12 @@ LINUX32_LIBS+= libnvidia-gpucomp.so.${PORTVERSION}
.else .else
PLIST_RE+= '\,${LINUXBASE}.*libnvidia-gpucomp\.so,d' PLIST_RE+= '\,${LINUXBASE}.*libnvidia-gpucomp\.so,d'
.endif # 545.00 .endif # 545.00
.if ${NVVERSION} >= 550.00000 # 550.00 .if ${NVVERSION} >= 565.00000 # 565.00
LINUX_LIBS+= libnvidia-egl-gbm.so.1.1.2
LINUX_LINKS+= libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so.1 \
libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so
PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.1.1.2/'
.elif ${NVVERSION} >= 550.00000 # 550.00
LINUX_LIBS+= libnvidia-egl-gbm.so.1.1.1 LINUX_LIBS+= libnvidia-egl-gbm.so.1.1.1
LINUX_LINKS+= libnvidia-egl-gbm.so.1.1.1 libnvidia-egl-gbm.so.1 \ LINUX_LINKS+= libnvidia-egl-gbm.so.1.1.1 libnvidia-egl-gbm.so.1 \
libnvidia-egl-gbm.so.1.1.1 libnvidia-egl-gbm.so libnvidia-egl-gbm.so.1.1.1 libnvidia-egl-gbm.so
@ -300,7 +309,7 @@ LINUX_LIBS+= libnvidia-egl-gbm.so.1.1.0
LINUX_LINKS+= libnvidia-egl-gbm.so.1.1.0 libnvidia-egl-gbm.so.1 \ LINUX_LINKS+= libnvidia-egl-gbm.so.1.1.0 libnvidia-egl-gbm.so.1 \
libnvidia-egl-gbm.so.1.1.0 libnvidia-egl-gbm.so libnvidia-egl-gbm.so.1.1.0 libnvidia-egl-gbm.so
PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.1.1.0/' PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.1.1.0/'
.endif # 550.00 .endif # 565.00
.if ${NVVERSION} >= 525.08902 # 525.89.02 .if ${NVVERSION} >= 525.08902 # 525.89.02
LINUX_LIBS+= libnvoptix.so.${PORTVERSION} \ LINUX_LIBS+= libnvoptix.so.${PORTVERSION} \
libnvidia-nvvm.so.${PORTVERSION} \ libnvidia-nvvm.so.${PORTVERSION} \

View file

@ -1,6 +1,6 @@
TIMESTAMP = 1727593735 TIMESTAMP = 1729779155
SHA256 (NVIDIA-Linux-x86_64-550.120.run) = 801928274753ccce7627098ea078cc37070ddae04de3aa084591c05fc7035697 SHA256 (NVIDIA-Linux-x86_64-550.127.05.run) = d384f34f5d2a896bd7536d3deb6a6d973d8094a3ad485a1c2ee3bf5192086ae9
SIZE (NVIDIA-Linux-x86_64-550.120.run) = 307064664 SIZE (NVIDIA-Linux-x86_64-550.127.05.run) = 307139930
SHA256 (NVIDIA-Linux-x86_64-470.161.03.run) = 5da82a7f8c76e781e7d7f0be7b798db4d344f26bd4facf9abcf3c71c71fe7640 SHA256 (NVIDIA-Linux-x86_64-470.161.03.run) = 5da82a7f8c76e781e7d7f0be7b798db4d344f26bd4facf9abcf3c71c71fe7640
SIZE (NVIDIA-Linux-x86_64-470.161.03.run) = 272397700 SIZE (NVIDIA-Linux-x86_64-470.161.03.run) = 272397700
SHA256 (NVIDIA-Linux-x86_64-390.154.run) = f4420280c55210964c008d5b724f2615845d47ad4c9c05d8ed26a62fc6331f7c SHA256 (NVIDIA-Linux-x86_64-390.154.run) = f4420280c55210964c008d5b724f2615845d47ad4c9c05d8ed26a62fc6331f7c

View file

@ -1,4 +1,4 @@
# NVIDIA Distversion # NVIDIA Distversion
# #
# This will be included from x11/nvidia-driver and the nvidia-drm port # This will be included from x11/nvidia-driver and the nvidia-drm port
NVIDIA_DISTVERSION = 550.120 NVIDIA_DISTVERSION = 550.127.05

View file

@ -1,6 +1,6 @@
TIMESTAMP = 1727593598 TIMESTAMP = 1729779540
SHA256 (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 9e2bb3dc93be5da6abe0c78621120e71dfcc0973577c9e63386e9a582501147e SHA256 (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3
SIZE (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 143460952 SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432
SHA256 (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 54f87e6cadc4aedebc4f862e3d25657fddb867ddc3fe01ad06c9d54bcfa8d607 SHA256 (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 54f87e6cadc4aedebc4f862e3d25657fddb867ddc3fe01ad06c9d54bcfa8d607
SIZE (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 99719576 SIZE (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 99719576
SHA256 (NVIDIA-FreeBSD-x86_64-390.154.tar.gz) = 5994c77c3510a4a89076ecf2bf402f1da635b250cca07655efc913f2a94bee84 SHA256 (NVIDIA-FreeBSD-x86_64-390.154.tar.gz) = 5994c77c3510a4a89076ecf2bf402f1da635b250cca07655efc913f2a94bee84