From nobody Mon Jan 16 08:24:04 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 4NwQ6F2c79z2t60l; Mon, 16 Jan 2023 08:24:05 +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 4NwQ6F1bFsz3kyt; Mon, 16 Jan 2023 08:24:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673857445; 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=JVODkPJGI8k9kyr0956zstPk9hae0MIdno/QmfUIe4k=; b=ZtHyptTSnPjtM1e43gWrfcO5B/Y9tPMBAvBfFcII2ZlzajPEFUPq/tiBL1XJPZCvLpCWj0 5UIPJoxnILjMb9KjXE+o/1gwexkORazkJYsOQROxq59ki1CYdreU9g396YtAuFKl5BOkSR sAAQ7ZrpWJuDWYU7v93b80wyT5ZWILHoUiaLhLpkLhH/Uqt9OUtHviH/atdX3rBUh5B7n8 J5VPviQFvvt63cJokG5vl2DjMV7hw3x1yYQjKFzH3F+9znCluv62gk5nvbvJbo44VF37r7 ICzo8TZ0GPQs6/YQ41fENfpS+VFfYGUWE40WBKlriTZOPBGXRNQ6XT6akoirHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673857445; 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=JVODkPJGI8k9kyr0956zstPk9hae0MIdno/QmfUIe4k=; b=Ie9cvuDoSmDDn4GCjWOFtATKvAuU7xHzW6MxO5c9SACy8J0nwYJ7xWsDW6rtVvewb7jQqj h4isXVpSMqP062H0fCjzC84qcggRp1ERUeLKsbn9BHFchO6PdfHwKrtXLJ76Kv090G/qME q9kVRVL13kDWyHvExjDAEx02TPdPPSuOzo64lkxUJq9WByoER0c0M4Wt7NU3CFwvb5g6Ei GOjx2EpjxOHkRU9t7XOgYwUyN8Ha4woYCoWl8pgVjJLWDkPMGHQwvF00Czazz8r2k+xTKf nSVzpw14jfs56CuIRk+OzITiG/kKPTp6a+Twb6BIPQXewV+4enOYZIUpv18slQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673857445; a=rsa-sha256; cv=none; b=mdZi6qLF6fSezq/kdjqNl64/HYYBXnvjrdSNIyWuf3Bbc/oiY1YMeBfcE0RNCz/oJCLJFj wXl+sXgsI1zNxFnuCFZWrBkjadpaePyRe0CiVi4yqljVIb5qSSk8ZcUj23mqy+lZNT1kXo QgIc7iyRgAUzGqZcJfJuIfiQKfrd2oDk/+8UcyXnbrSVOk4874vxeHhfWdgtEEnPsqPB8+ C0V7JxNGQw86hhHoqm/swURuRsq30O4C8nRe882Y3cevUpnKxAl8p6KK3LHFXEX1cbwYAL BD5V3p4Vd06JchYk4Go7jf5duSKmEsmz02fgM7lGDmspuvyL1Ty7KUHiXwcsAQ== 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 4NwQ6F0dsGz10vY; Mon, 16 Jan 2023 08:24:05 +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 30G8O4jv018808; Mon, 16 Jan 2023 08:24:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30G8O477018807; Mon, 16 Jan 2023 08:24:04 GMT (envelope-from git) Date: Mon, 16 Jan 2023 08:24:04 GMT Message-Id: <202301160824.30G8O477018807@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: 0b25e08a0d2b - main - x11/nvidia-driver: unbreak the build of nVidia legacy drivers 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: 0b25e08a0d2b4b5f0022ac26dbd987302a238d9b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=0b25e08a0d2b4b5f0022ac26dbd987302a238d9b commit 0b25e08a0d2b4b5f0022ac26dbd987302a238d9b Author: Alexey Dokuchaev AuthorDate: 2023-01-16 08:23:32 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-01-16 08:23:32 +0000 x11/nvidia-driver: unbreak the build of nVidia legacy drivers This partially reverts unapproved commit 010b19127cc8. --- .../files/patch-src_nvidia_nvidia__os.c | 34 ---------------------- x11/nvidia-driver/pkg-message | 10 ------- 2 files changed, 44 deletions(-) diff --git a/x11/nvidia-driver/files/patch-src_nvidia_nvidia__os.c b/x11/nvidia-driver/files/patch-src_nvidia_nvidia__os.c deleted file mode 100644 index 42ab3ffa2d9d..000000000000 --- a/x11/nvidia-driver/files/patch-src_nvidia_nvidia__os.c +++ /dev/null @@ -1,34 +0,0 @@ -- 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 deleted file mode 100644 index 3751893d1775..000000000000 --- a/x11/nvidia-driver/pkg-message +++ /dev/null @@ -1,10 +0,0 @@ -[ -{ type: install - message: <