From owner-svn-ports-all@freebsd.org Mon Feb 8 02:55:34 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D0E0854209B; Mon, 8 Feb 2021 02:55:34 +0000 (UTC) (envelope-from danfe@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 4DYrHV5YbXz4Wtg; Mon, 8 Feb 2021 02:55:34 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B1A737D2C; Mon, 8 Feb 2021 02:55:34 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 1182tY8u059169; Mon, 8 Feb 2021 02:55:34 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 1182tYSn059167; Mon, 8 Feb 2021 02:55:34 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202102080255.1182tYSn059167@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Mon, 8 Feb 2021 02:55:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564674 - in head/x11/nvidia-driver: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/x11/nvidia-driver: . files X-SVN-Commit-Revision: 564674 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2021 02:55:34 -0000 Author: danfe Date: Mon Feb 8 02:55:34 2021 New Revision: 564674 URL: https://svnweb.freebsd.org/changeset/ports/564674 Log: Split another patch I've missed in r564088 which is needed for 460.xx. Reported by: dhw Analyzed by: avg Added: head/x11/nvidia-driver/files/460-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c - copied, changed from r564012, head/x11/nvidia-driver/files/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c Modified: head/x11/nvidia-driver/Makefile Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Mon Feb 8 02:54:58 2021 (r564673) +++ head/x11/nvidia-driver/Makefile Mon Feb 8 02:55:34 2021 (r564674) @@ -13,7 +13,7 @@ PORTNAME= nvidia-driver DISTVERSION?= 460.39 # Always try to set PORTREVISION as it can be overridden by the slave ports -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= x11 MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION} DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION} @@ -74,7 +74,8 @@ SUB_PATCHES+= extra-patch-src-nvidia_ctl.c \ .else EXTRA_PATCHES+= ${FILESDIR}/460-patch-lib-libGLX_nvidia-Makefile \ ${FILESDIR}/460-patch-src-nvidia-nvidia_ctl.c \ - ${FILESDIR}/460-patch-src-nvidia-nvidia_linux.c + ${FILESDIR}/460-patch-src-nvidia-nvidia_linux.c \ + ${FILESDIR}/460-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c .endif OPTIONS_DEFINE= ACPI_PM LINUX WBINVD DOCS Copied and modified: head/x11/nvidia-driver/files/460-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c (from r564012, head/x11/nvidia-driver/files/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c) ============================================================================== --- head/x11/nvidia-driver/files/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c Thu Feb 4 10:11:36 2021 (r564012, copy source) +++ head/x11/nvidia-driver/files/460-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c Mon Feb 8 02:55:34 2021 (r564674) @@ -1,9 +1,9 @@ --- src/nvidia-modeset/nvidia-modeset-freebsd.c.orig 2018-08-21 23:09:28 UTC +++ src/nvidia-modeset/nvidia-modeset-freebsd.c @@ -25,6 +25,7 @@ - #include #include #include + #include +#include #include "nvkms-ioctl.h" @@ -30,7 +30,7 @@ if (ref_ptr) { mtx_init(&ref_ptr->lock, "nvkms-ref-ptr-lock", NULL, MTX_SPIN); // The ref_ptr owner counts as a reference on the ref_ptr itself. -@@ -867,33 +869,31 @@ static int nvkms_poll( +@@ -867,29 +869,31 @@ static int nvkms_poll( *************************************************************************/ #if defined(NVKMS_SUPPORT_LINUX_COMPAT) @@ -54,12 +54,8 @@ - u_long cmd; + static const uint32_t dir[4] = { IOC_VOID, IOC_IN, IOC_OUT, IOC_INOUT }; --#if NV_FGET_HAS_CAP_RIGHTS_T_ARG - cap_rights_t rights; - status = fget(td, args->fd, cap_rights_init(&rights, CAP_IOCTL), &fp); --#else -- status = fget(td, args->fd, &fp); --#endif - - if (status != 0) { - return status;