svn commit: r564674 - in head/x11/nvidia-driver: . files
Alexey Dokuchaev
danfe at FreeBSD.org
Mon Feb 8 02:55:34 UTC 2021
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 <sys/poll.h>
#include <sys/file.h>
#include <sys/proc.h>
+ #include <sys/stack.h>
+#include <sys/sysproto.h>
#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;
More information about the svn-ports-head
mailing list