Page MenuHomeFreeBSD
Files F150546226

D50053.id154847.diff
No OneTemporary
Actions

D50053.id154847.diff
View Options

diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -14,7 +14,7 @@
PORTNAME?= nvidia-driver
DISTVERSION?= ${NVIDIA_DISTVERSION}
# Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= x11
MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
@@ -83,7 +83,7 @@
# Temporarily disable GSP firmware as it is known to cause
# issues with suspend/resume
.if ${NVVERSION} >= 565.00000
-SUB_PATCHES+= extra-gsp-patch-src-nvidia_subr.c
+SUB_PATCHES+= extra-gsp-patch-src-common-inc-nv_firmware_registry.h
.endif
DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0
diff --git a/x11/nvidia-driver/files/extra-gsp-patch-src-common-inc-nv_firmware_registry.h.in b/x11/nvidia-driver/files/extra-gsp-patch-src-common-inc-nv_firmware_registry.h.in
new file mode 100644
--- /dev/null
+++ b/x11/nvidia-driver/files/extra-gsp-patch-src-common-inc-nv_firmware_registry.h.in
@@ -0,0 +1,11 @@
+--- src/common/inc/nv-firmware-registry.h.orig
++++ src/common/inc/nv-firmware-registry.h
+@@ -62,7 +62,7 @@
+ #define NV_REG_ENABLE_GPU_FIRMWARE_POLICY_MASK 0x000000F0
+ #define NV_REG_ENABLE_GPU_FIRMWARE_POLICY_ALLOW_FALLBACK 0x00000010
+
+-#define NV_REG_ENABLE_GPU_FIRMWARE_DEFAULT_VALUE 0x00000012
++#define NV_REG_ENABLE_GPU_FIRMWARE_DEFAULT_VALUE 0x00000000
+
+ //
+ // Registry key that when enabled, will send GPU firmware logs
diff --git a/x11/nvidia-driver/files/extra-gsp-patch-src-nvidia_subr.c.in b/x11/nvidia-driver/files/extra-gsp-patch-src-nvidia_subr.c.in
deleted file mode 100644
--- a/x11/nvidia-driver/files/extra-gsp-patch-src-nvidia_subr.c.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/nvidia/nvidia_subr.c.orig 2025-04-14 16:14:13 UTC
-+++ src/nvidia/nvidia_subr.c
-@@ -32,7 +32,7 @@ nv_cap_t *nvidia_caps_root = NULL;
- nv_state_t nvidia_ctl_state;
- nv_cap_t *nvidia_caps_root = NULL;
-
--const NvBool nv_is_rm_firmware_supported_os = NV_TRUE;
-+const NvBool nv_is_rm_firmware_supported_os = NV_FALSE;
-
- static struct callout snapshot_timer;
- static struct mtx snapshot_timer_mutex;
diff --git a/x11/nvidia-driver/files/pkg-message.in b/x11/nvidia-driver/files/pkg-message.in
--- a/x11/nvidia-driver/files/pkg-message.in
+++ b/x11/nvidia-driver/files/pkg-message.in
@@ -32,9 +32,12 @@
in /var/log/Xorg.0.log while actually you have ``options SYSVSHM''
enabled in kernel, the sysctl ``kern.ipc.shmall'' should be increased.
-In certain 570 versions GSP firmware is known to cause issues with
-suspend/resume. To disable GSP firmware add
-hw.nvidia.registry.EnableGpuFirmware=0 to your loader.conf.
+Because in certain 570 versions GSP firmware is known to cause issues
+with suspend/resume, thus, disabled by default for now.
+On the other hand, some GPUs are known NOT to work without GSP
+firmware support.
+To enable GSP firmware add hw.nvidia.registry.EnableGpuFirmware=1
+to your loader.conf.
https://download.nvidia.com/XFree86/FreeBSD-x86_64/560.31.02/README/gsp.html

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 3, 6:00 AM (3 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30681427
Default Alt Text
D50053.id154847.diff (3 KB)

Event Timeline