From nobody Thu Jun 30 22:29:58 2022 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 949C5873061; Thu, 30 Jun 2022 22:29:59 +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 4LYtLZ3FzXz3PkG; Thu, 30 Jun 2022 22:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656628198; 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=o2gHeIMKp23HTvDmo7mbd9ntiY3OQz7Asb8eimv0+Gk=; b=SQBxwQ+sSOA3ezlVV+91+wUW3Fbu2XO2l2Eb3ulw/CLL2HBy2am+RuzCbstbEaYvVeimkY jqPxihBb48l/QnZFzPjbuBjR818PIeWL6XHZbC/Jd68Cbsk0DvC2k7JEGj0ZfeNcN0Kwdy gVodQ+koz72jdXpkQtn26W2hIQW73E7KRLS9rt7fZjnt44RDF8w6db53iu3ijulfZPypa2 1itt3AMWU0hBCe/ziRGYAWDpDDTlq72LgJtc4E7+FM5nzr/isrN2RwvRhND/R2F/gzbinL XqYRAsFFw4XmJBtximos0ZL/4WqfMCuPxZmCVLFsMZze+eNs+cQKZf4uloqYqg== 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 3EAEE7312; Thu, 30 Jun 2022 22:29:58 +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 25UMTwl6018774; Thu, 30 Jun 2022 22:29:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25UMTwXE018773; Thu, 30 Jun 2022 22:29:58 GMT (envelope-from git) Date: Thu, 30 Jun 2022 22:29:58 GMT Message-Id: <202206302229.25UMTwXE018773@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: John Baldwin Subject: git: 88501f5bcc43 - main - x11/nvidia-driver: Remove devclass from DRIVER_MODULE on recent main. 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: jhb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88501f5bcc43dd694c44f09262164c4fdcfae1a1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656628198; 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=o2gHeIMKp23HTvDmo7mbd9ntiY3OQz7Asb8eimv0+Gk=; b=lVb1DzSWo3WwbyY1vWSlOVXYQIUSGfRNx/iTw7p5z3fuF712hIYQwaWR2Vpz2BKfEQoadD XPI9lhHdsxB22XvirtpVH11ZByHiSRkRNtMWvopd40rBj4gFORLFYipJHQRqntRAZmsG/2 kkm56x3kJJWV+xNaEnhR+Aa6sVbCpzLZnnaLIViBXemlvfq/YFYEz+8n24GpPVYV0UjaCH pMIF2X7JGrsnOFc7gAKklPAXriYvAzjrKriHhdtkLiVItFjf4l5/NvAUuqmNKOrcS4Uqzl jMDvJdfQ4XmdPVTEn+MVnsKhFvU1RiL4V8FB12Wv20QrvVw210WJ+DuIMVDRYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656628198; a=rsa-sha256; cv=none; b=wLpveRz0MylLgkQpAvX7gGdoZ1ehcBRydR40MDccMNIsZaSAa1cJyuz/w2ngJWPVARCwbM gnw5HiUFVotPo9Ztshyd88KCDOSMLg01CJUdhsd64kDzWP3K6sM4nMiNS4cwv/3NwSOShf VMRRGWOYd+qY+54jtdrZJ4qMN5TSw7Odi+O3I9NDxOdeAKNqNB/VDrTDbFhzBaNRibogt3 EcsD2w2oC12tW0G1OfsBqLoX06lJ4zKDk4KMUizHn8vPOXKozEDUK8aE9KyD/dN/8QpaqD ghfgTVHuxOxeW8XKbv213XL8y1ZDbxxEoJJTMkhGuNuXgKPffDf7Zd97AzNGbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb (doc, src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=88501f5bcc43dd694c44f09262164c4fdcfae1a1 commit 88501f5bcc43dd694c44f09262164c4fdcfae1a1 Author: John Baldwin AuthorDate: 2022-06-30 22:29:46 +0000 Commit: John Baldwin CommitDate: 2022-06-30 22:29:46 +0000 x11/nvidia-driver: Remove devclass from DRIVER_MODULE on recent main. Initialize nvidia_devclass in nvidia_modevent instead. Reviewed by: danfe Differential Revision: https://reviews.freebsd.org/D35266 --- x11/nvidia-driver/Makefile | 8 +++++++- x11/nvidia-driver/files/extra-patch-src-nvidia_subr.c.in | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 4962687b0e93..ba0f4261e1eb 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -64,7 +64,8 @@ SUB_FILES+= nvidia.conf SUB_FILES+= pkg-deinstall pkg-install .endif SUB_PATCHES= extra-patch-src-Makefile \ - extra-patch-src-nv-freebsd.h + extra-patch-src-nv-freebsd.h \ + extra-patch-src-nvidia_subr.c .if ${NVVERSION} < 510.03901 SUB_PATCHES+= extra-patch-src-nvidia_dev.c \ extra-patch-src-nvidia_pci.c @@ -231,6 +232,11 @@ post-patch: .SILENT ${REINPLACE_CMD} -e '/void nvidia_dev_dtor/,+8s,.*status.*,,' \ ${WRKSRC}/src/${NVSRC}/nvidia_dev.c .endif +# After src 2a99dd30dfaa, DRIVER_MODULE should not include nvidia_devclass +.if ${OSVERSION} >= 1400058 + ${REINPLACE_CMD} -e '/^DRIVER_MODULE/s/, nvidia_devclass//' \ + ${WRKSRC}/src/${NVSRC}/nvidia_pci.c +.endif # Finally, process OPTIONS .if ${PORT_OPTIONS:MFREEBSD_AGP} ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \ diff --git a/x11/nvidia-driver/files/extra-patch-src-nvidia_subr.c.in b/x11/nvidia-driver/files/extra-patch-src-nvidia_subr.c.in new file mode 100644 index 000000000000..05cc03676821 --- /dev/null +++ b/x11/nvidia-driver/files/extra-patch-src-nvidia_subr.c.in @@ -0,0 +1,12 @@ +--- src/%%NVSRC%%/nvidia_subr.c.orig 2022-03-16 11:18:11 UTC ++++ src/%%NVSRC%%/nvidia_subr.c +@@ -727,6 +727,9 @@ int nvidia_modevent( + * time. + */ + sc = &nvidia_ctl_sc; ++#if __FreeBSD_version >= 1400058 ++ nvidia_devclass = devclass_create("nvidia"); ++#endif + + nvidia_stack_t_zone = uma_zcreate("nvidia_stack_t", sizeof(nvidia_stack_t), + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);