diff options
| author | Austin Shafer <ashafer@FreeBSD.org> | 2025-04-14 12:19:19 -0400 |
|---|---|---|
| committer | Austin Shafer <ashafer@FreeBSD.org> | 2025-04-15 09:31:07 -0400 |
| commit | 9c0e0196bdc6ddf75e801bda7f673ee2db645ad7 (patch) | |
| tree | bd5cb85456c8dd892e048f84d1aec69aed73c71f | |
| parent | comms/kermit: update C-Kermit to version 10.0.416 Beta.12 (diff) | |
x11/nvidia-driver: disable GSP Firmware by default
Users have reported issues with suspend/resume when GSP firmware is
enabled. This change disables GSP to unbreak desktop use cases while
a fix is delivered in a future driver version
PR: 285803
Reviewed by: Tomoaki AOKI <junchoon@dec.sakura.ne.jp>
Approved by: kbowling (mentor)
Differential Revision: https://reviews.freebsd.org/D49828
| -rw-r--r-- | x11/nvidia-driver/Makefile | 8 | ||||
| -rw-r--r-- | x11/nvidia-driver/files/extra-gsp-patch-src-nvidia_subr.c.in | 11 |
2 files changed, 18 insertions, 1 deletions
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index da198721d85f..8e0f04596be8 100644 --- 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?= 1 +PORTREVISION?= 2 CATEGORIES= x11 MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION} DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION} @@ -80,6 +80,12 @@ SUB_PATCHES+= extra-patch-src-nvidia_dev.c \ SUB_PATCHES+= extra-patch-src-nvidia_subr.c .endif +# 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 +.endif + DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0 MODULESDIR= lib/xorg/modules EXTENSIONSDIR?= ${MODULESDIR}/extensions/.nvidia 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 new file mode 100644 index 000000000000..1f09b6c683a3 --- /dev/null +++ b/x11/nvidia-driver/files/extra-gsp-patch-src-nvidia_subr.c.in @@ -0,0 +1,11 @@ +--- 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; |