From nobody Sun Sep 29 09:40:47 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XGfMg4gT2z5XQ5h; Sun, 29 Sep 2024 09:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XGfMg3kdXz49LC; Sun, 29 Sep 2024 09:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727602847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C2qQyzPRYGG3zugR/UubhiCEZ/1/rAQdK2rxRv8DrSY=; b=jVJC/Oya1bRNhc8UIPOdFgW+GvMTIAsIcz1BYSHwTsX0YEp3bByfXl4HTMrGreQLNjRT+B NGow7VJvXMn1uZyHH/D0aYstsg1IuOKQvRg2U3NYZByoODV+PpYsd+Aa1UZJDC3POnJEVE KnqZxIropXuiRixZh9hVUj/qwRWdKZl1z1Ola+ZhQCG+fs9Ls5g9jSWedTUMC22lG5sWo1 ym2tRMIOnZ78cULi6/qwMSUiEEYi5a7XjdL1Ujajihr1ahPlovWq6xQE/VsRdaKow6ghYl tiHr9Bv8TUGEQP1x28dAI91+BzHGgXRzrO0RfruTt2Ix7MdO1lEv70eLrVpz7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727602847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C2qQyzPRYGG3zugR/UubhiCEZ/1/rAQdK2rxRv8DrSY=; b=hcbVKVXBgeD9wwHtoAvVthBuAt2DcfKlyT+rEfLII93HzsLLukh6/1iUya//OK5nKrGZ/R Z9y3yymW3OnBNowfzgQTs/fdjHiOVnqKOwXbSsPjpcoGEadkpQ0R4Sm3NNM6fKpoFzr/wD zbAY1dVvaBu1bRRAE3Pr+Alo8EbjrONLXw4C0IRKoKG8NKW0oT3eQkVRGGIGKxzL1h65ic 6keV4tRNgOYPGryVsLFLTejteDazMweaQf7DYwJsDvK59vtfJ2Ma3k1QFWqKLVGnxglE/g qNDbzhPntjOJcZxKPE+dXAb2ce4Vs9ZTOCiwbj/lsanvTnrgB6HhyJGQwyTWkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727602847; a=rsa-sha256; cv=none; b=Y7lDuDs+WZrP7zLzD/dOKVnpZqKh4pXYZBFekw86ZWc666qnTa8blUJ6nVYa6glEFn/neu CIMUZ+IbfrshQ49NPXi3AWa6+RZD3GnJaZSiXXwUn1t69zaCIKdCd8oRFbJfwxy/n9wblD rdWEeivnoDlcq/FqXt7FlSbMfG/riIzE0jDwyC1PTqCtHA7pGcsHqPMO5s79+Dk6Y0y5hi ZTDDwCwc2sNyWk/Lmb50t8W4JK/RuotRCrdZgIb4I1CQ/RBOwJq2/KpvIqIrG9NQF6AG9U n9EOTmIYRyZAPacQaxX2J45uPXSLTNW7myV0331kQlcepLThTIOOfbxc+Ap8/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XGfMg3Kkdz13jB; Sun, 29 Sep 2024 09:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48T9elHN049475; Sun, 29 Sep 2024 09:40:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48T9el7B049472; Sun, 29 Sep 2024 09:40:47 GMT (envelope-from git) Date: Sun, 29 Sep 2024 09:40:47 GMT Message-Id: <202409290940.48T9el7B049472@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kevin Bowling Subject: git: 4aa7e5605dd8 - main - x11/nvidia-driver: Prepare for GSP firmware in 560 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4aa7e5605dd808709154e842895ac3401e097d6b Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=4aa7e5605dd808709154e842895ac3401e097d6b commit 4aa7e5605dd808709154e842895ac3401e097d6b Author: Tomoaki AOKI AuthorDate: 2024-09-29 07:16:53 +0000 Commit: Kevin Bowling CommitDate: 2024-09-29 09:40:10 +0000 x11/nvidia-driver: Prepare for GSP firmware in 560 PR: 280772 Approved by: maintainer timeout --- x11/nvidia-driver/Makefile | 4 ++++ x11/nvidia-driver/pkg-plist | 2 ++ 2 files changed, 6 insertions(+) diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 3fd6e3722bb8..ba87e2a0088d 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -372,6 +372,10 @@ post-install: .SILENT .if ${NVVERSION} < 545.000 ${REINPLACE_CMD} -e '/libnvidia-gpucomp\.so/d' ${TMPPLIST} .endif +.if ${NVVERSION} < 560.02803 + ${REINPLACE_CMD} -e '/nvidia_gsp_ga10x_fw\.ko/d' ${TMPPLIST} + ${REINPLACE_CMD} -e '/nvidia_gsp_tu10x_fw\.ko/d' ${TMPPLIST} +.endif .if ${NVVERSION} < 410.057 # Rename some libraries and install a libmap file to resolve conflict with diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist index 973dc8193b11..3c61dc2818ce 100644 --- a/x11/nvidia-driver/pkg-plist +++ b/x11/nvidia-driver/pkg-plist @@ -107,3 +107,5 @@ share/vulkan/implicit_layer.d/nvidia_layers.json %%MODULESDIR%%/extensions/libglxserver_nvidia.so.1 /%%KMODDIR%%/nvidia.ko /%%KMODDIR%%/nvidia-modeset.ko +/%%KMODDIR%%/nvidia_gsp_ga10x_fw.ko +/%%KMODDIR%%/nvidia_gsp_tu10x_fw.ko