Attachment #220380 for bug #249505




# $FreeBSD$

PORTNAME=	nvidia-libs
DISTVERSION?=	450.80.02
# Always try to set PORTREVISION as it can be overridden by the slave ports
PORTREVISION?=	0
CATEGORIES=	x11 linux

.else
PLIST_RE+=	'\,${LINUXBASE}.*libEGL_nvidia\.so,d'
.endif
.if ${NVVERSION} >= 450.057
LINUX_LIBS+=	libGLESv1_CM_nvidia.so.${PORTVERSION} \
		libGLESv2_nvidia.so.${PORTVERSION} \
		libGLX_nvidia.so.${PORTVERSION} \
		libnvidia-ptxjitcompiler.so.${PORTVERSION}
LINUX_LINKS+=	libGLESv1_CM_nvidia.so.${PORTVERSION} libGLESv1_CM_nvidia.so.1 \
		libGLESv2_nvidia.so.${PORTVERSION} libGLESv2_nvidia.so.2 \
		libGLX_nvidia.so.${PORTVERSION} libGLX_nvidia.so.0 \
		libGLX_nvidia.so.${PORTVERSION} libGLX_indirect.so.0 \
		libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so.1 \
		libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so
LINUX32_LIBS+=	libGLESv1_CM_nvidia.so.${PORTVERSION} \
		libGLESv2_nvidia.so.${PORTVERSION} \
		libGLX_nvidia.so.${PORTVERSION} \
		libnvidia-ptxjitcompiler.so.${PORTVERSION}
LINUX32_LINKS+=	libGLESv1_CM_nvidia.so.${PORTVERSION} libGLESv1_CM_nvidia.so.1 \
		libGLESv2_nvidia.so.${PORTVERSION} libGLESv2_nvidia.so.2 \
		libGLX_nvidia.so.${PORTVERSION} libGLX_nvidia.so.0 \
		libGLX_nvidia.so.${PORTVERSION} libGLX_indirect.so.0 \
		libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so.1 \
		libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so
.elif ${NVVERSION} >= 361.016 && ${NVVERSION} < 450.057
LINUX_LIBS+=	libGLESv1_CM_nvidia.so.${PORTVERSION} \
		libGLESv2_nvidia.so.${PORTVERSION} \
		libGLX_nvidia.so.${PORTVERSION} \
		libnvidia-fatbinaryloader.so.${PORTVERSION} \
		libnvidia-ptxjitcompiler.so.${PORTVERSION}
LINUX_LINKS+=	libGLESv1_CM_nvidia.so.${PORTVERSION} libGLESv1_CM_nvidia.so.1 \

Lines 1-6 Link Here

(-)x11/linux-nvidia-libs/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1482026038	1	TIMESTAMP = 1607472630
2	SHA256 (NVIDIA-Linux-x86_64-440.100.run) = 649684fab4f37b178afb6cae012e7f9736377d89fa8abdfca26f24a13bbacf1f	2	SHA256 (NVIDIA-Linux-x86_64-450.80.02.run) = 0f5a2f19f822d46c54500f4a6192dad9948821ed14ce7c13b38264d67aaf95b3
3	SIZE (NVIDIA-Linux-x86_64-440.100.run) = 144653408	3	SIZE (NVIDIA-Linux-x86_64-450.80.02.run) = 141055124
4	SHA256 (NVIDIA-Linux-x86_64-390.138.run) = 5ffb19e6c86c28e51d710f9679386e3c755161cf747bf3e83647a3486859d666	4	SHA256 (NVIDIA-Linux-x86_64-390.138.run) = 5ffb19e6c86c28e51d710f9679386e3c755161cf747bf3e83647a3486859d666
5	SIZE (NVIDIA-Linux-x86_64-390.138.run) = 83780873	5	SIZE (NVIDIA-Linux-x86_64-390.138.run) = 83780873
6	SHA256 (NVIDIA-Linux-x86-390.138.run) = 7bf67323a393e857a09f979f155baa1ed13183653add0c344edf4d409f977878	6	SHA256 (NVIDIA-Linux-x86-390.138.run) = 7bf67323a393e857a09f979f155baa1ed13183653add0c344edf4d409f977878

Lines 11-19 Link Here

(-)x11/nvidia-driver/Makefile (-2 / +2 lines)
11	# or `x11/nvidia-driver-304').	11	# or `x11/nvidia-driver-304').
12		12
13	PORTNAME= nvidia-driver	13	PORTNAME= nvidia-driver
14	DISTVERSION?= 440.100	14	DISTVERSION?= 450.80.02
15	# Always try to set PORTREVISION as it can be overridden by the slave ports	15	# Always try to set PORTREVISION as it can be overridden by the slave ports
16	PORTREVISION?= 1	16	PORTREVISION?= 0
17	CATEGORIES= x11	17	CATEGORIES= x11
18	MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}	18	MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
19	DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}	19	DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}

Lines 1-6 Link Here

(-)x11/nvidia-driver/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1482026038	1	TIMESTAMP = 1607069413
2	SHA256 (NVIDIA-FreeBSD-x86_64-440.100.tar.gz) = da5abe605560890405976785eb28e6d9fa79181ac7d158e52e5327d4d0faef5f	2	SHA256 (NVIDIA-FreeBSD-x86_64-450.80.02.tar.gz) = 007aaffb8a59f73c9e5b9505a32ec4ab4542779c1ba4e73d2c572b7ace96c4e7
3	SIZE (NVIDIA-FreeBSD-x86_64-440.100.tar.gz) = 82523267	3	SIZE (NVIDIA-FreeBSD-x86_64-450.80.02.tar.gz) = 83040706
4	SHA256 (NVIDIA-FreeBSD-x86_64-390.138.tar.gz) = 51cb38cd826ba34c1cc71db5bd3ef645b4cfb5647311e255b4631e5c41d0ba07	4	SHA256 (NVIDIA-FreeBSD-x86_64-390.138.tar.gz) = 51cb38cd826ba34c1cc71db5bd3ef645b4cfb5647311e255b4631e5c41d0ba07
5	SIZE (NVIDIA-FreeBSD-x86_64-390.138.tar.gz) = 65280213	5	SIZE (NVIDIA-FreeBSD-x86_64-390.138.tar.gz) = 65280213
6	SHA256 (NVIDIA-FreeBSD-x86-390.138.tar.gz) = ca06e877af81e2e895a92fc9ec6f5bc106a48a0223912992d5cb0f482c9dac9a	6	SHA256 (NVIDIA-FreeBSD-x86-390.138.tar.gz) = ca06e877af81e2e895a92fc9ec6f5bc106a48a0223912992d5cb0f482c9dac9a




--- src/%%NVSRC%%/nvidia_ctl.c.orig	2020-09-23 00:54:46 UTC
+++ src/%%NVSRC%%/nvidia_ctl.c
@@ -13,6 +13,12 @@
 #include "nv.h"

+#endif
+
 static d_open_t  nvidia_ctl_open;
 static void nvidia_ctl_dtor(void *arg);
 static d_ioctl_t nvidia_ctl_ioctl;
 static d_poll_t  nvidia_ctl_poll;
@@ -162,6 +168,18 @@ static int nvidia_ctl_mmap_single(
 
 int nvidia_ctl_attach(void)
 {

     if (nvidia_count == 0) {
         nvidia_ctl_cdev = make_dev(&nvidia_ctl_cdevsw,
                 CDEV_CTL_MINOR,
@@ -169,6 +187,10 @@ int nvidia_ctl_attach(void)
                 "%s", nvidia_ctl_cdevsw.d_name);
         if (nvidia_ctl_cdev == NULL)
             return ENOMEM;

     }
 
     nvidia_count++;
@@ -177,10 +199,26 @@ int nvidia_ctl_attach(void)
 
 int nvidia_ctl_detach(void)
 {

+        .linux_char_device = 1
+    };
+#endif
+
 
     sc = &nvidia_ctl_sc;
     nvidia_count--;
 
-    if (nvidia_count == 0)




--- src/nvidia-modeset/nvidia-modeset-freebsd.c.orig	2020-09-23 00:54:46 UTC
+++ src/nvidia-modeset/nvidia-modeset-freebsd.c
@@ -26,6 +26,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"
 #include "nvidia-modeset-os-interface.h"
@@ -51,6 +52,7 @@
     #include "machine/../linux32/linux32_proto.h"
   #endif
   #include <compat/linux/linux_ioctl.h>

 #endif
 
 
@@ -267,7 +269,7 @@ struct nvkms_ref_ptr {
 
 struct nvkms_ref_ptr* NVKMS_API_CALL nvkms_alloc_ref_ptr(void *ptr)
 {

     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.
@@ -888,33 +890,31 @@ static int nvkms_poll(
  *************************************************************************/
 
 #if defined(NVKMS_SUPPORT_LINUX_COMPAT)

 }
 
 #define NVKMS_LINUX_IOCTL_MIN _IOC(0, NVKMS_IOCTL_MAGIC, NVKMS_IOCTL_CMD, 0)
@@ -930,6 +930,7 @@ static struct linux_ioctl_handler nvkms_linux_ioctl_ha
 static void nvkms_linux_compat_load(void)
 {
 #if defined(NVKMS_SUPPORT_LINUX_COMPAT)

     linux_ioctl_register_handler(&nvkms_linux_ioctl_handler);
 #endif
 }
@@ -938,6 +939,7 @@ static void nvkms_linux_compat_unload(void)
 {
 #if defined(NVKMS_SUPPORT_LINUX_COMPAT)
     linux_ioctl_unregister_handler(&nvkms_linux_ioctl_handler);

 #endif
 }
 
@@ -1121,4 +1123,9 @@ MODULE_DEPEND(nvidia_modeset,               /* module 
 MODULE_DEPEND(nvidia_modeset,               /* module name */
               linux,                        /* prerequisite module */
               1, 1, 1);                     /* vmin, vpref, vmax */

Lines 1-8 Link Here

(-)x11/nvidia-driver/files/patch-mk_nvidia.lib.mk (-5 / +5 lines)
1	--- mk/nvidia.lib.mk.orig 2013-08-16 10:53:30.000000000 +0200	1	--- mk/nvidia.lib.mk.orig 2020-09-23 00:45:08 UTC
2	+++ mk/nvidia.lib.mk 2014-01-27 16:55:39.000000000 +0100	2	+++ mk/nvidia.lib.mk
3	@@ -46,8 +46,8 @@	3	@@ -52,8 +52,8 @@ install: ${EXTRADEPS}
4	.endif
5	.endif	4	.endif
		5	.endif
6	.if defined(AUXLINK_TGT)	6	.if defined(AUXLINK_TGT)
7	- @rm -f ${AUXLINK_LINK}	7	- @rm -f ${AUXLINK_LINK}
8	- @ln -fs ${AUXLINK_TGT} ${AUXLINK_LINK}	8	- @ln -fs ${AUXLINK_TGT} ${AUXLINK_LINK}
Lines 10-13 Link Here
10	+ @ln -fs ${AUXLINK_TGT} ${DESTDIR}${AUXLINK_LINK}	10	+ @ln -fs ${AUXLINK_TGT} ${DESTDIR}${AUXLINK_LINK}
11	.endif	11	.endif
12	.if defined(STATICLIB_NAME)	12	.if defined(STATICLIB_NAME)
13	@rm -f ${DESTDIR}${LIBDIR}/${STATICLIB_NAME}	13	@rm -f ${DESTDIR}${THISLIBDIR}/${STATICLIB_NAME}

Lines 2-8 Link Here

(-)x11/nvidia-settings/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= nvidia-settings	4	PORTNAME= nvidia-settings
5	PORTVERSION= 440.100	5	PORTVERSION= 450.80.02
6	CATEGORIES= x11	6	CATEGORIES= x11
7		7
8	MAINTAINER= x11@FreeBSD.org	8	MAINTAINER= x11@FreeBSD.org

Lines 1-3 Link Here

(-)x11/nvidia-settings/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1593032511	1	TIMESTAMP = 1607071616
2	SHA256 (NVIDIA-nvidia-settings-440.100_GH0.tar.gz) = 562e487261986f4e5241f554b14b799fd9184cdb121532c0e3fe309709c37719	2	SHA256 (NVIDIA-nvidia-settings-450.80.02_GH0.tar.gz) = f22a3ccba1bf06ced7a2087b8179e73a5e98f18ab587dd1e5e65cd34873ef4a9
3	SIZE (NVIDIA-nvidia-settings-440.100_GH0.tar.gz) = 1314731	3	SIZE (NVIDIA-nvidia-settings-450.80.02_GH0.tar.gz) = 1229535

Lines 2-8 Link Here

(-)x11/nvidia-xconfig/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= nvidia-xconfig	4	PORTNAME= nvidia-xconfig
5	PORTVERSION= 440.100	5	PORTVERSION= 450.80.02
6	CATEGORIES= x11	6	CATEGORIES= x11
7		7
8	MAINTAINER= x11@FreeBSD.org	8	MAINTAINER= x11@FreeBSD.org

Lines 1-3 Link Here

(-)x11/nvidia-xconfig/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1593032427	1	TIMESTAMP = 1607071951
2	SHA256 (NVIDIA-nvidia-xconfig-440.100_GH0.tar.gz) = 2517e614b8500f69099b74abceb782ca4741c61dc288560d9d39c40cfa458b1d	2	SHA256 (NVIDIA-nvidia-xconfig-450.80.02_GH0.tar.gz) = 63ebd00a115e2376dbfa2519dc5804a4e200f365054baf805245d525b745ad86
3	SIZE (NVIDIA-nvidia-xconfig-440.100_GH0.tar.gz) = 141048	3	SIZE (NVIDIA-nvidia-xconfig-450.80.02_GH0.tar.gz) = 141053

Return to bug 249505

Lines 1-7 Link Here

(-)x11/linux-nvidia-libs/Makefile (-2 / +23 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= nvidia-libs	3	PORTNAME= nvidia-libs
4	DISTVERSION?= 440.100	4	DISTVERSION?= 450.80.02
5	# Always try to set PORTREVISION as it can be overridden by the slave ports	5	# Always try to set PORTREVISION as it can be overridden by the slave ports
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES= x11 linux	7	CATEGORIES= x11 linux
Lines 93-102 PLIST_RE+= '\,${LINUXBASE}.*libEGL_nvidia\.so\.${P Link Here
93	.else	93	.else
94	PLIST_RE+= '\,${LINUXBASE}.*libEGL_nvidia\.so,d'	94	PLIST_RE+= '\,${LINUXBASE}.*libEGL_nvidia\.so,d'
95	.endif	95	.endif
96	.if ${NVVERSION} >= 361.016	96	.if ${NVVERSION} >= 450.057
97	LINUX_LIBS+= libGLESv1_CM_nvidia.so.${PORTVERSION} \	97	LINUX_LIBS+= libGLESv1_CM_nvidia.so.${PORTVERSION} \
98	libGLESv2_nvidia.so.${PORTVERSION} \	98	libGLESv2_nvidia.so.${PORTVERSION} \
99	libGLX_nvidia.so.${PORTVERSION} \	99	libGLX_nvidia.so.${PORTVERSION} \
		100	libnvidia-ptxjitcompiler.so.${PORTVERSION}
		101	LINUX_LINKS+= libGLESv1_CM_nvidia.so.${PORTVERSION} libGLESv1_CM_nvidia.so.1 \
		102	libGLESv2_nvidia.so.${PORTVERSION} libGLESv2_nvidia.so.2 \
		103	libGLX_nvidia.so.${PORTVERSION} libGLX_nvidia.so.0 \
		104	libGLX_nvidia.so.${PORTVERSION} libGLX_indirect.so.0 \
		105	libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so.1 \
		106	libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so
		107	LINUX32_LIBS+= libGLESv1_CM_nvidia.so.${PORTVERSION} \
		108	libGLESv2_nvidia.so.${PORTVERSION} \
		109	libGLX_nvidia.so.${PORTVERSION} \
		110	libnvidia-ptxjitcompiler.so.${PORTVERSION}
		111	LINUX32_LINKS+= libGLESv1_CM_nvidia.so.${PORTVERSION} libGLESv1_CM_nvidia.so.1 \
		112	libGLESv2_nvidia.so.${PORTVERSION} libGLESv2_nvidia.so.2 \
		113	libGLX_nvidia.so.${PORTVERSION} libGLX_nvidia.so.0 \
		114	libGLX_nvidia.so.${PORTVERSION} libGLX_indirect.so.0 \
		115	libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so.1 \
		116	libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so
		117	.elif ${NVVERSION} >= 361.016 && ${NVVERSION} < 450.057
		118	LINUX_LIBS+= libGLESv1_CM_nvidia.so.${PORTVERSION} \
		119	libGLESv2_nvidia.so.${PORTVERSION} \
		120	libGLX_nvidia.so.${PORTVERSION} \
100	libnvidia-fatbinaryloader.so.${PORTVERSION} \	121	libnvidia-fatbinaryloader.so.${PORTVERSION} \
101	libnvidia-ptxjitcompiler.so.${PORTVERSION}	122	libnvidia-ptxjitcompiler.so.${PORTVERSION}
102	LINUX_LINKS+= libGLESv1_CM_nvidia.so.${PORTVERSION} libGLESv1_CM_nvidia.so.1 \	123	LINUX_LINKS+= libGLESv1_CM_nvidia.so.${PORTVERSION} libGLESv1_CM_nvidia.so.1 \

Lines 48-54 Link Here

(-)x11/linux-nvidia-libs/pkg-plist (-2 lines)
48	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-encode.so	48	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-encode.so
49	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-encode.so.1	49	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-encode.so.1
50	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-encode.so.%%SHLIB_VERSION%%	50	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-encode.so.%%SHLIB_VERSION%%
51	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fatbinaryloader.so.%%SHLIB_VERSION%%
52	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so	51	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so
53	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.1	52	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.1
54	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.%%SHLIB_VERSION%%	53	%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.%%SHLIB_VERSION%%
Lines 119-125 Link Here
119	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so	118	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so
120	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so.1	119	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so.1
121	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so.%%SHLIB_VERSION%%	120	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so.%%SHLIB_VERSION%%
122	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fatbinaryloader.so.%%SHLIB_VERSION%%
123	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so	121	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so
124	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.1	122	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.1
125	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.%%SHLIB_VERSION%%	123	%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.%%SHLIB_VERSION%%

Lines 1-4 Link Here

(-)x11/nvidia-driver/files/extra-patch-src-nvidia_ctl.c.in (-8 / +6 lines)
1	--- src/%%NVSRC%%/nvidia_ctl.c.orig 2017-09-14 20:46:30 UTC	1	--- src/%%NVSRC%%/nvidia_ctl.c.orig 2020-09-23 00:54:46 UTC
2	+++ src/%%NVSRC%%/nvidia_ctl.c	2	+++ src/%%NVSRC%%/nvidia_ctl.c
3	@@ -13,6 +13,12 @@	3	@@ -13,6 +13,12 @@
4	#include "nv.h"	4	#include "nv.h"
Lines 11-19 Link Here
11	+#endif	11	+#endif
12	+	12	+
13	static d_open_t nvidia_ctl_open;	13	static d_open_t nvidia_ctl_open;
14	static void nvidia_ctl_dtor(void *arg);
15	static d_ioctl_t nvidia_ctl_ioctl;	14	static d_ioctl_t nvidia_ctl_ioctl;
16	@@ -138,6 +144,18 @@ static int nvidia_ctl_poll(	15	static d_poll_t nvidia_ctl_poll;
		16	@@ -162,6 +168,18 @@ static int nvidia_ctl_mmap_single(
17		17
18	int nvidia_ctl_attach(void)	18	int nvidia_ctl_attach(void)
19	{	19	{
Lines 32-38 Link Here
32	if (nvidia_count == 0) {	32	if (nvidia_count == 0) {
33	nvidia_ctl_cdev = make_dev(&nvidia_ctl_cdevsw,	33	nvidia_ctl_cdev = make_dev(&nvidia_ctl_cdevsw,
34	CDEV_CTL_MINOR,	34	CDEV_CTL_MINOR,
35	@@ -145,6 +163,10 @@ int nvidia_ctl_attach(void)	35	@@ -169,6 +187,10 @@ int nvidia_ctl_attach(void)
36	"%s", nvidia_ctl_cdevsw.d_name);	36	"%s", nvidia_ctl_cdevsw.d_name);
37	if (nvidia_ctl_cdev == NULL)	37	if (nvidia_ctl_cdev == NULL)
38	return ENOMEM;	38	return ENOMEM;
Lines 43-49 Link Here
43	}	43	}
44		44
45	nvidia_count++;	45	nvidia_count++;
46	@@ -153,13 +175,28 @@ int nvidia_ctl_attach(void)	46	@@ -177,10 +199,26 @@ int nvidia_ctl_attach(void)
47		47
48	int nvidia_ctl_detach(void)	48	int nvidia_ctl_detach(void)
49	{	49	{
Lines 58-66 Link Here
58	+ .linux_char_device = 1	58	+ .linux_char_device = 1
59	+ };	59	+ };
60	+#endif	60	+#endif
61	struct nvidia_softc *sc;	61	+
62
63	sc = &nvidia_ctl_sc;
64	nvidia_count--;	62	nvidia_count--;
65		63
66	- if (nvidia_count == 0)	64	- if (nvidia_count == 0)

Lines 1-14 Link Here

(-)x11/nvidia-driver/files/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c (-9 / +9 lines)
1	--- src/nvidia-modeset/nvidia-modeset-freebsd.c.orig 2018-08-21 23:09:28 UTC	1	--- src/nvidia-modeset/nvidia-modeset-freebsd.c.orig 2020-09-23 00:54:46 UTC
2	+++ src/nvidia-modeset/nvidia-modeset-freebsd.c	2	+++ src/nvidia-modeset/nvidia-modeset-freebsd.c
3	@@ -25,6 +25,7 @@	3	@@ -26,6 +26,7 @@
4	#include <sys/poll.h>
5	#include <sys/file.h>	4	#include <sys/file.h>
6	#include <sys/proc.h>	5	#include <sys/proc.h>
		6	#include <sys/stack.h>
7	+#include <sys/sysproto.h>	7	+#include <sys/sysproto.h>
8		8
9	#include "nvkms-ioctl.h"	9	#include "nvkms-ioctl.h"
10	#include "nvidia-modeset-os-interface.h"	10	#include "nvidia-modeset-os-interface.h"
11	@@ -48,6 +49,7 @@	11	@@ -51,6 +52,7 @@
12	#include "machine/../linux32/linux32_proto.h"	12	#include "machine/../linux32/linux32_proto.h"
13	#endif	13	#endif
14	#include <compat/linux/linux_ioctl.h>	14	#include <compat/linux/linux_ioctl.h>
Lines 16-22 Link Here
16	#endif	16	#endif
17		17
18		18
19	@@ -250,7 +252,7 @@ struct nvkms_ref_ptr {	19	@@ -267,7 +269,7 @@ struct nvkms_ref_ptr {
20		20
21	struct nvkms_ref_ptr* NVKMS_API_CALL nvkms_alloc_ref_ptr(void *ptr)	21	struct nvkms_ref_ptr* NVKMS_API_CALL nvkms_alloc_ref_ptr(void *ptr)
22	{	22	{
Lines 25-31 Link Here
25	if (ref_ptr) {	25	if (ref_ptr) {
26	mtx_init(&ref_ptr->lock, "nvkms-ref-ptr-lock", NULL, MTX_SPIN);	26	mtx_init(&ref_ptr->lock, "nvkms-ref-ptr-lock", NULL, MTX_SPIN);
27	// The ref_ptr owner counts as a reference on the ref_ptr itself.	27	// The ref_ptr owner counts as a reference on the ref_ptr itself.
28	@@ -867,33 +869,31 @@ static int nvkms_poll(	28	@@ -888,33 +890,31 @@ static int nvkms_poll(
29	*************************************************************************/	29	*************************************************************************/
30		30
31	#if defined(NVKMS_SUPPORT_LINUX_COMPAT)	31	#if defined(NVKMS_SUPPORT_LINUX_COMPAT)
Lines 76-82 Link Here
76	}	76	}
77		77
78	#define NVKMS_LINUX_IOCTL_MIN _IOC(0, NVKMS_IOCTL_MAGIC, NVKMS_IOCTL_CMD, 0)	78	#define NVKMS_LINUX_IOCTL_MIN _IOC(0, NVKMS_IOCTL_MAGIC, NVKMS_IOCTL_CMD, 0)
79	@@ -909,6 +909,7 @@ static struct linux_ioctl_handler nvkms_linux_ioctl_ha	79	@@ -930,6 +930,7 @@ static struct linux_ioctl_handler nvkms_linux_ioctl_ha
80	static void nvkms_linux_compat_load(void)	80	static void nvkms_linux_compat_load(void)
81	{	81	{
82	#if defined(NVKMS_SUPPORT_LINUX_COMPAT)	82	#if defined(NVKMS_SUPPORT_LINUX_COMPAT)
Lines 84-90 Link Here
84	linux_ioctl_register_handler(&nvkms_linux_ioctl_handler);	84	linux_ioctl_register_handler(&nvkms_linux_ioctl_handler);
85	#endif	85	#endif
86	}	86	}
87	@@ -917,6 +918,7 @@ static void nvkms_linux_compat_unload(void)	87	@@ -938,6 +939,7 @@ static void nvkms_linux_compat_unload(void)
88	{	88	{
89	#if defined(NVKMS_SUPPORT_LINUX_COMPAT)	89	#if defined(NVKMS_SUPPORT_LINUX_COMPAT)
90	linux_ioctl_unregister_handler(&nvkms_linux_ioctl_handler);	90	linux_ioctl_unregister_handler(&nvkms_linux_ioctl_handler);
Lines 92-98 Link Here
92	#endif	92	#endif
93	}	93	}
94		94
95	@@ -1100,4 +1102,9 @@ MODULE_DEPEND(nvidia_modeset, /* module	95	@@ -1121,4 +1123,9 @@ MODULE_DEPEND(nvidia_modeset, /* module
96	MODULE_DEPEND(nvidia_modeset, /* module name */	96	MODULE_DEPEND(nvidia_modeset, /* module name */
97	linux, /* prerequisite module */	97	linux, /* prerequisite module */
98	1, 1, 1); /* vmin, vpref, vmax */	98	1, 1, 1); /* vmin, vpref, vmax */