From nobody Wed Mar 1 10:20:30 2023 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 4PRVcG2ZzYz3vhJV; Wed, 1 Mar 2023 10:20:30 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PRVcG1sSYz4LJ0; Wed, 1 Mar 2023 10:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677666030; 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=+++k2zvBADU8+VlZHo645kzkVLjgMoottw8odFzFpQI=; b=v/AClJIera/xeMy62HYJnsiRWj/6Eksyd/NojGcHFkNQVrpooPhwTl7J85raO+Ln1lSv2m tejvk9CVT7xHhRlgAKpPJf0L9N3X/UAr9krIzIvVVJYI8n3cKDM03JK+w4dxbfXCZ/L+eB LZvNyk7aCIeNYIkE9j/NdZqN3dtlDPyDHc1b62uFCQvoh+K0jdXdG5c9Zky0dYhWkmemRo 6nHXNJMvShKLdrMRRoDj1KDsTKNC6nASGCfwo/M05aUbIkb6nA0ACJFYpSrp8NvGCSGiQA 2vsYVSS2j9WI3FW++d0qEdXiVGI9UUZ52qBG25NFwi4jCiPo41AvbqieUexpIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677666030; 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=+++k2zvBADU8+VlZHo645kzkVLjgMoottw8odFzFpQI=; b=fVLlTmMq8Lwc+0CDwo1Fjd21E5d74Zu+RtJkU4nAqIookSM8+siVMYHDNjf3SrOOYfMPr1 YY4Pz028yM3S9BLTo075L0xt1bL3Bm87jnQvHuRa1TrOfkWLyP07Qbq0XaeLiDGjjsm6wv /PRImr1QBjgDOdWYtDbgmzkvu+QuKd1j3TkNPTm4nKCkaIRSy/ju0gMZcXeDEx83lQauXC R4DHxIPnUTEzaVWVFbJQbJfWVURNfFKg74MsRi8fzdysZxCFPFBd0+3asQEZVi3G08jXtr rLlbsbkVuM1ZsOqOBjTKxija07Kmc8+959PNuTBWLRalcVMQcBv7pcPizSF6aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677666030; a=rsa-sha256; cv=none; b=b4okgLBN0WeBJLS35UvIs5b7nf9VerZRuxQ3Z1neDvD2+e7EeFu0RIHClhiTMMH5Y99+3U AiliZFffHtw5EBalDJV9T3s3vburZUj7ex4l3tpWoXVRYRJJZCd4GLyOj1ajz783ThXqTd r349RktGha70PDGRx8E94YGXDeml7QbQrGKfXDMWdEEonqMMP7V/vZyAIxRpWQw/4obR6q p9sl+ULsTkAahnE8oIR1xonSO0AQBHl7aIbjiSoVDpD7G/GunishgDA+49cJXnK6rQqO/s SCueSYpHupt1yJM/qNErW+EIhaFSJRok+zS/4HcHSzZakoJN1Z4rkTsWCk+s6g== 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 4PRVcG0vsPzWLy; Wed, 1 Mar 2023 10:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 321AKUmS086949; Wed, 1 Mar 2023 10:20:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321AKUmI086948; Wed, 1 Mar 2023 10:20:30 GMT (envelope-from git) Date: Wed, 1 Mar 2023 10:20:30 GMT Message-Id: <202303011020.321AKUmI086948@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: a09185f8b66c - main - x11/nvidia-driver: reword the pkg-message to reflect modern reality 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a09185f8b66c462d3bc1d1d7526d667770319aaf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=a09185f8b66c462d3bc1d1d7526d667770319aaf commit a09185f8b66c462d3bc1d1d7526d667770319aaf Author: Alexey Dokuchaev AuthorDate: 2023-03-01 10:19:30 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-03-01 10:19:30 +0000 x11/nvidia-driver: reword the pkg-message to reflect modern reality Try to reduce readers' confusion by specifying exactly which nVidia kernel module users should be loading these days. PR: 269626 --- x11/nvidia-driver/Makefile | 11 ++++++++--- x11/nvidia-driver/files/pkg-message.in | 20 ++++---------------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 44ad13ae53a3..f236e95abf80 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -1,12 +1,11 @@ -# # For those wondering why this port is not under `x11-drivers' category, # have a look at https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=121930. # # Starting with version 1.0-7667, NVidia has dropped support for numerous # "legacy" GPUs. Consult NVidia README (the Appendix) to find out whether # you need to use legacy driver version and install one of corresponding -# slave ports instead (`x11/nvidia-driver-390', `x11/nvidia-driver-340', -# or `x11/nvidia-driver-304'). +# slave ports instead (`x11/nvidia-driver-470', `x11/nvidia-driver-390', +# `x11/nvidia-driver-340', or `x11/nvidia-driver-304'). # # To simplify testing of new feature branches and beta driver versions, # the port aims to support building against arbitrary DISTVERSION, i.e. @@ -88,6 +87,12 @@ NVSRC= . NVSRC= nvidia .endif +.if ${NVVERSION} < 358.009 +SUB_LIST+= KLDNAME=nvidia +.else +SUB_LIST+= KLDNAME=nvidia-modeset +.endif + .if ${NVVERSION} < 460.039 . if ${NVVERSION} >= 358.009 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c diff --git a/x11/nvidia-driver/files/pkg-message.in b/x11/nvidia-driver/files/pkg-message.in index 7041d306e72c..7987b59d3463 100644 --- a/x11/nvidia-driver/files/pkg-message.in +++ b/x11/nvidia-driver/files/pkg-message.in @@ -4,13 +4,12 @@ To use these drivers, make sure that you have loaded the NVidia kernel module, by running - # kldload nvidia (or nvidia-modeset, see below) + # kldload %%KLDNAME%% -on the command line, or by putting ``nvidia'' (or ``nvidia-modeset'', -see below again) on ``kld_list'' variable in /etc/rc.conf, either manually -or by running +on the command line, or by putting ``%%KLDNAME%%'' on the ``kld_list'' +variable in /etc/rc.conf, either manually or by running - # sysrc kld_list+=nvidia (or nvidia-modeset, see below) + # sysrc kld_list+=%%KLDNAME%% If you build this port with FreeBSD AGP GART driver, make sure you have agp.ko kernel module installed and loaded, since nvidia.ko will depend @@ -33,17 +32,6 @@ If X.org cannot start and reports in /var/log/Xorg.0.log while actually you have ``options SYSVSHM'' enabled in kernel, the sysctl ``kern.ipc.shmall'' should be increased. -Starting with version 358.09, some important functionality of the driver -has been broken out into a separate kernel module, nvidia-modeset.ko. -Users that experience hangs when starting X11 server, or observe - - (II) NVIDIA(0): Validated MetaModes: - (II) NVIDIA(0): "NULL" - -in /var/log/Xorg.0.log should replace ``nvidia'' with ``nvidia-modeset'' -in their /boot/loader.conf or /etc/rc.conf configuration files, depending -on how they prefer to load NVidia driver kernel module. - See %%DOCSDIR%%/README for more information. EOM }