From nobody Mon Jan 16 06:38:34 2023 X-Original-To: dev-commits-ports-all@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 4NwMmW25rPz2stFW; Mon, 16 Jan 2023 06:38:35 +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 4NwMmW1hR5z3PsB; Mon, 16 Jan 2023 06:38:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673851115; 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=IXiebNAt98ZQn0sjq+MDkQpeW2xvZ/HGOEsFPEWd860=; b=D2ljcOHhFLWEhSG6kr87J/l8hAFrvvWVBp/b59nsY4F0vSOv8A2mRRcHnayVxwECrUc+/a TmzSJV8mCrSz24LnHXrivTVtax0Rb76a4nOq34ObFTZ+iZw8QVl3UFbqb4BFmrJm76FxNC req+0Js+YppGkzqxhwwzOGxas/+sEgBtWUPL3Y2x0AuBoqb7XhiWAdlc9bz5YqCa9LhO+l wG5+8ZJRLmWQt+LnKpitCbvw+zgyGBF+Mb6z5hgjkfbU+TTOLCWykjnh20pSZMPhr4JPQn P7HTuMyCP5D2sxThl8omjt/s74SQ20dlfP+OOOd44KCVC1rTsuQVMm1UldxKFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673851115; 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=IXiebNAt98ZQn0sjq+MDkQpeW2xvZ/HGOEsFPEWd860=; b=gHUbce4roMVL6D5AUfnzsqmxy/74IxXoyhgbBUspcX3OOFceDRXiGzv0tSgPibZPBPlT0w PiSOMD1r1JOjvnNRJVw0TGOos+y907xWRAcMNlEyYXWse+Dx2UyXV8EMGro/b1HkXrP2zi 692AHxsMu0TuPthJyysnaspXTZfrYjKDlkh9faV8CLqOZbssMNUs46SdHQ3dhJT1a82Kz4 Ze9V5OXaJGQxnE8cmVjEl9NhROrMbE4NzCaLM5BlTE2QUNLsOoZceJcRFECVAVM7KHVPOq lgm2lnMfAqYu3xSfILS2wXGWpeFVJbLNEKwwFLK9CDv8kQ6sozSIrQJJ7gb4uQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673851115; a=rsa-sha256; cv=none; b=kBAHQdsfNiD/h4eKfIyxUD5h9nhK+IRNGxTlhl1b4J73A1yrhsbmWzrHI43yfgP75IQTpW B2PdR7r43ShsV5hqfvgBr6wXg1YbmXS4zPcsr3PzibIu8s3fjZQbT+6jPpA1XnMmhglyHD J20mHLv18L2c1g4Q1RjKr+/vurpgu6J0Z8y2k9B89mPVH6YtBjr4+CEpokO4RkbaSLAYsu YpcccQA+iFxjALiTvDIVbf4BioXaQ9OAMzq7pa1D81YjwQa2isp/xiO1tno3ZZSJv+kfim ouF+PySxkaQslcKHxhrDqILP77b1PBujKsaQ1gDvjcYUsD5ZR4cnuqDGvay4Kg== 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 4NwMmW0VDGzxN1; Mon, 16 Jan 2023 06:38:35 +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 30G6cYpc061848; Mon, 16 Jan 2023 06:38:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30G6cY6J061847; Mon, 16 Jan 2023 06:38:34 GMT (envelope-from git) Date: Mon, 16 Jan 2023 06:38:34 GMT Message-Id: <202301160638.30G6cY6J061847@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 010b19127cc8 - main - x11/nvidia-driver: Fix bug that switching to the terminal wasn't possible List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 010b19127cc848d585ab515ea2db29796b441929 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=010b19127cc848d585ab515ea2db29796b441929 commit 010b19127cc848d585ab515ea2db29796b441929 Author: Yuri Victorovich AuthorDate: 2023-01-16 06:35:56 +0000 Commit: Yuri Victorovich CommitDate: 2023-01-16 06:38:30 +0000 x11/nvidia-driver: Fix bug that switching to the terminal wasn't possible Tested with NVidia RTX 2060 on FreeBSD 13.1 STABLE. PR: 213912 Approved by: danfe@ (maintainer's timeout; 18 days) --- x11/nvidia-driver/Makefile | 2 +- .../files/patch-src_nvidia_nvidia__os.c | 34 ++++++++++++++++++++++ x11/nvidia-driver/pkg-message | 10 +++++++ 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 0225c71a0268..44ad13ae53a3 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -15,7 +15,7 @@ PORTNAME?= nvidia-driver DISTVERSION?= 510.60.02 # Always try to set PORTREVISION as it can be overridden by the slave ports -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11 MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION} DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION} diff --git a/x11/nvidia-driver/files/patch-src_nvidia_nvidia__os.c b/x11/nvidia-driver/files/patch-src_nvidia_nvidia__os.c new file mode 100644 index 000000000000..42ab3ffa2d9d --- /dev/null +++ b/x11/nvidia-driver/files/patch-src_nvidia_nvidia__os.c @@ -0,0 +1,34 @@ +- vbe framebuffer mode adjustment that enables switch back and forth to the black terminal +- from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=213912#c17 + +--- src/nvidia/nvidia_os.c.orig 2022-12-27 22:31:44 UTC ++++ src/nvidia/nvidia_os.c +@@ -789,6 +789,28 @@ void NV_API_CALL os_get_screen_info( + *pFbPitch = efifb->fb_stride * (bpp / NBBY); + return; + } ++ ++ const struct vbe_fb *vbefb = ++ (const struct vbe_fb *)preload_search_info(kmdp, MODINFO_METADATA | ++ MODINFOMD_VBE_FB); ++ ++ /* Make sure base address is mapped to GPU BAR */ ++ if ((vbefb != NULL) && ++ ((vbefb->fb_addr == consoleBar1Address) || ++ (vbefb->fb_addr == consoleBar2Address))) ++ { ++ int depth = fls(vbefb->fb_mask_red | vbefb->fb_mask_green | ++ vbefb->fb_mask_blue | vbefb->fb_mask_reserved); ++ int bpp = roundup2(depth, NBBY); ++ ++ *pPhysicalAddress = vbefb->fb_addr; ++ *pFbWidth = vbefb->fb_width; ++ *pFbHeight = vbefb->fb_height; ++ *pFbDepth = depth; ++ /* fb_stride is in pixels. Convert to bytes */ ++ *pFbPitch = vbefb->fb_stride * (bpp / NBBY); ++ return; ++ } + } + { + const sc_softc_t *sc = sc_get_softc(0, SC_KERNEL_CONSOLE); diff --git a/x11/nvidia-driver/pkg-message b/x11/nvidia-driver/pkg-message new file mode 100644 index 000000000000..3751893d1775 --- /dev/null +++ b/x11/nvidia-driver/pkg-message @@ -0,0 +1,10 @@ +[ +{ type: install + message: <