Attachment #226916 for bug #257456

Lines 1-5 Link Here

(-)b/x11/linux-nvidia-libs/Makefile (-1 / +1 lines)
1	PORTNAME= nvidia-libs	1	PORTNAME= nvidia-libs
2	DISTVERSION?= 460.84	2	DISTVERSION?= 470.57.02
3	# Always try to set PORTREVISION as it can be overridden by the slave ports	3	# Always try to set PORTREVISION as it can be overridden by the slave ports
4	PORTREVISION?= 0	4	PORTREVISION?= 0
5	CATEGORIES= x11 linux	5	CATEGORIES= x11 linux

Lines 1-4 Link Here

(-)b/x11/linux-nvidia-libs/distinfo (-1 / +3 lines)
1	TIMESTAMP = 1620395714	1	TIMESTAMP = 1626704423
		2	SHA256 (NVIDIA-Linux-x86_64-470.57.02.run) = 55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
		3	SIZE (NVIDIA-Linux-x86_64-470.57.02.run) = 273219658
2	SHA256 (NVIDIA-Linux-x86_64-460.84.run) = a10d2171d6b2c55f63791f58264f9e92829ee4b2779b9b1d011274e63b46b960	4	SHA256 (NVIDIA-Linux-x86_64-460.84.run) = a10d2171d6b2c55f63791f58264f9e92829ee4b2779b9b1d011274e63b46b960
3	SIZE (NVIDIA-Linux-x86_64-460.84.run) = 177840337	5	SIZE (NVIDIA-Linux-x86_64-460.84.run) = 177840337
4	SHA256 (NVIDIA-Linux-x86_64-390.144.run) = 8bb6e8de89e8f8325466af29cf0fa235c988d19137f7fe3eb6bfae1d5e305e74	6	SHA256 (NVIDIA-Linux-x86_64-390.144.run) = 8bb6e8de89e8f8325466af29cf0fa235c988d19137f7fe3eb6bfae1d5e305e74

Lines 14-20 Link Here

(-)b/x11/nvidia-driver/Makefile (-1 / +6 lines)
14	# ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work.	14	# ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work.
15		15
16	PORTNAME?= nvidia-driver	16	PORTNAME?= nvidia-driver
17	DISTVERSION?= 460.84	17	DISTVERSION?= 470.57.02
18	# Always try to set PORTREVISION as it can be overridden by the slave ports	18	# Always try to set PORTREVISION as it can be overridden by the slave ports
19	PORTREVISION?= 0	19	PORTREVISION?= 0
20	CATEGORIES= x11	20	CATEGORIES= x11
Lines 92-97 EXTRA_PATCHES+= ${FILESDIR}/460-patch-src-nvidia-nvidia_ctl.c \ Link Here
92	.endif	92	.endif
93	.if ${NVVERSION} < 470.04201	93	.if ${NVVERSION} < 470.04201
94	SUB_PATCHES+= extra-patch-src-nv-misc.h	94	SUB_PATCHES+= extra-patch-src-nv-misc.h
		95	.else
		96	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_nvidia_nv-freebsd.h \
		97	${FILESDIR}/extra-patch-src_nvidia_nvidia__ctl.c \
		98	${FILESDIR}/extra-patch-src_nvidia_nvidia__dev.c \
		99	${FILESDIR}/extra-patch-src_nvidia_nvidia__subr.c
95	.endif	100	.endif
96		101
97	OPTIONS_DEFINE= ACPI_PM LINUX WBINVD DOCS	102	OPTIONS_DEFINE= ACPI_PM LINUX WBINVD DOCS

Lines 1-6 Link Here

(-)b/x11/nvidia-driver/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1620395718	1	TIMESTAMP = 1626704305
2	SHA256 (NVIDIA-FreeBSD-x86_64-460.84.tar.gz) = 920cca0df1bf3eedcc2dbe8fca1711b3ab0e09b7864e0bbc990dfd7d35bde0e8	2	SHA256 (NVIDIA-FreeBSD-x86_64-470.57.02.tar.xz) = 1803b39ed3a9f185c6a4528181917af4a56610acfedccc98df0d60d2e498e8f2
3	SIZE (NVIDIA-FreeBSD-x86_64-460.84.tar.gz) = 108291070	3	SIZE (NVIDIA-FreeBSD-x86_64-470.57.02.tar.xz) = 99335120
4	SHA256 (NVIDIA-FreeBSD-x86_64-390.144.tar.gz) = a3ecf4d1cb7190c43e1c910a66c5920072fef887ccab70e11b899c748d880afd	4	SHA256 (NVIDIA-FreeBSD-x86_64-390.144.tar.gz) = a3ecf4d1cb7190c43e1c910a66c5920072fef887ccab70e11b899c748d880afd
5	SIZE (NVIDIA-FreeBSD-x86_64-390.144.tar.gz) = 65333942	5	SIZE (NVIDIA-FreeBSD-x86_64-390.144.tar.gz) = 65333942
6	SHA256 (NVIDIA-FreeBSD-x86-390.144.tar.gz) = 438ef26d32a596f199ac38e90a799c71111374c66572a725546c26055de7054b	6	SHA256 (NVIDIA-FreeBSD-x86-390.144.tar.gz) = 438ef26d32a596f199ac38e90a799c71111374c66572a725546c26055de7054b

Added Link Here

(-)b/x11/nvidia-driver/files/extra-patch-src_nvidia_nv-freebsd.h (+11 lines)
1	--- src/nvidia/nv-freebsd.h.orig 2021-08-02 23:24:12 UTC
2	+++ src/nvidia/nv-freebsd.h
3	@@ -161,7 +161,7 @@ struct nv_freebsd_file_private {
4
5	nv_state_t *nv;
6	STAILQ_HEAD(event_queue, nvidia_event) event_queue;
7	- struct mtx fops_mtx;
8	+ struct sx fops_sx;
9	nvidia_stack_t *fops_sp;
10	NvBool event_pending;
11	struct mtx event_mtx;




--- src/nvidia/nvidia_ctl.c.orig	2021-08-02 23:24:19 UTC
+++ src/nvidia/nvidia_ctl.c
@@ -52,7 +52,7 @@ static int nvidia_ctl_open(
         free(nvffp, M_NVIDIA);
         return ENOMEM;
     }
-    mtx_init(&nvffp->fops_mtx, "fops_mtx", NULL, MTX_DEF);
+    sx_init(&nvffp->fops_sx, "fops_sx");
 
     nvffp->nv = nv;
     mtx_init(&nvffp->event_mtx, "event_mtx", NULL, (MTX_DEF | MTX_RECURSE));
@@ -62,7 +62,7 @@ static int nvidia_ctl_open(
 
     if (status != 0) {
         mtx_destroy(&nvffp->event_mtx);
-        mtx_destroy(&nvffp->fops_mtx);
+        sx_destroy(&nvffp->fops_sx);
         NV_UMA_ZONE_FREE_STACK(nvffp->fops_sp);
         free(nvffp, M_NVIDIA);
         return status;
@@ -72,7 +72,7 @@ static int nvidia_ctl_open(
     if (status != 0) {
         nvidia_close_ctl(nv, nvffp);
         mtx_destroy(&nvffp->event_mtx);
-        mtx_destroy(&nvffp->fops_mtx);
+        sx_destroy(&nvffp->fops_sx);
         NV_UMA_ZONE_FREE_STACK(nvffp->fops_sp);
         free(nvffp, M_NVIDIA);
         return status;
@@ -95,7 +95,7 @@ void nvidia_ctl_dtor(void *arg)
     }
     mtx_destroy(&nvffp->event_mtx);
 
-    mtx_destroy(&nvffp->fops_mtx);
+    sx_destroy(&nvffp->fops_sx);
     NV_UMA_ZONE_FREE_STACK(nvffp->fops_sp);
 
     free(nvffp, M_NVIDIA);




--- src/nvidia/nvidia_dev.c.orig	2021-08-02 23:24:33 UTC
+++ src/nvidia/nvidia_dev.c
@@ -49,7 +49,7 @@ static int nvidia_dev_open(
         free(nvffp, M_NVIDIA);
         return ENOMEM;
     }
-    mtx_init(&nvffp->fops_mtx, "fops_mtx", NULL, MTX_DEF);
+    sx_init(&nvffp->fops_sx, "fops_sx");
 
     nvffp->nv = nv;
     mtx_init(&nvffp->event_mtx, "event_mtx", NULL, (MTX_DEF | MTX_RECURSE));
@@ -59,7 +59,7 @@ static int nvidia_dev_open(
 
     if (status != 0) {
         mtx_destroy(&nvffp->event_mtx);
-        mtx_destroy(&nvffp->fops_mtx);
+        sx_destroy(&nvffp->fops_sx);
         NV_UMA_ZONE_FREE_STACK(nvffp->fops_sp);
         free(nvffp, M_NVIDIA);
         return status;
@@ -69,7 +69,7 @@ static int nvidia_dev_open(
     if (status != 0) {
         nvidia_close_dev(nv, nvffp);
         mtx_destroy(&nvffp->event_mtx);
-        mtx_destroy(&nvffp->fops_mtx);
+        sx_destroy(&nvffp->fops_sx);
         NV_UMA_ZONE_FREE_STACK(nvffp->fops_sp);
         free(nvffp, M_NVIDIA);
         return status;
@@ -92,7 +92,7 @@ void nvidia_dev_dtor(void *arg)
     }
     mtx_destroy(&nvffp->event_mtx);
 
-    mtx_destroy(&nvffp->fops_mtx);
+    sx_destroy(&nvffp->fops_sx);
     NV_UMA_ZONE_FREE_STACK(nvffp->fops_sp);
 
     free(nvffp, M_NVIDIA);




--- src/nvidia/nvidia_subr.c.orig	2021-08-02 23:24:25 UTC
+++ src/nvidia/nvidia_subr.c
@@ -397,7 +397,7 @@ int nvidia_handle_ioctl(
         nr = xfer->cmd;
     }
 
-    mtx_lock(&nvffp->fops_mtx);
+    sx_xlock(&nvffp->fops_sx);
     sp = nvffp->fops_sp;
 
     switch (nr) {
@@ -471,7 +471,7 @@ int nvidia_handle_ioctl(
             break;
     }
 
-    mtx_unlock(&nvffp->fops_mtx);
+    sx_xunlock(&nvffp->fops_sx);
 
     if (args != (void *)data) {
         if (copyout(args, NvP64_VALUE(xfer->ptr), size) != 0)
@@ -1048,7 +1048,7 @@ NV_STATUS NV_API_CALL nv_add_mapping_context_to_file(
 
     nvffp = nv_get_nvffp_from_nvfp(nvfp);
 
-    mtx_lock(&nvffp->fops_mtx);
+    sx_xlock(&nvffp->fops_sx);
 
     nvamc = &nvffp->mmap_context;
 
@@ -1076,7 +1076,7 @@ NV_STATUS NV_API_CALL nv_add_mapping_context_to_file(
     nvamc->valid = NV_TRUE;
 
 done:
-    mtx_unlock(&nvffp->fops_mtx);
+    sx_xunlock(&nvffp->fops_sx);
     nv_put_file_private(priv);
 
     return status;
@@ -1503,7 +1503,7 @@ int nvidia_mmap_ctl_single(
     nv_alloc_mapping_context_t *mmap_context;
     int status;
 
-    mtx_lock(&nvffp->fops_mtx);
+    sx_xlock(&nvffp->fops_sx);
 
     mmap_context = &nvffp->mmap_context;
 
@@ -1532,7 +1532,7 @@ int nvidia_mmap_ctl_single(
     status = 0;
 
 done:
-    mtx_unlock(&nvffp->fops_mtx);
+    sx_xunlock(&nvffp->fops_sx);
 
     return status;
 }
@@ -1553,7 +1553,7 @@ int nvidia_mmap_dev_single(
     nv = nvffp->nv;
     sc = nv->os_state;
 
-    mtx_lock(&nvffp->fops_mtx);
+    sx_xlock(&nvffp->fops_sx);
 
     /*
      * If no mmap context is valid on this file descriptor then this mapping
@@ -1593,7 +1593,7 @@ int nvidia_mmap_dev_single(
     }
 
 done:
-    mtx_unlock(&nvffp->fops_mtx);
+    sx_xunlock(&nvffp->fops_sx);
 
     return status;
 }

Return to bug 257456

Added Link Here

(-)b/x11/nvidia-driver/files/extra-patch-src_nvidia_nvidia__ctl.c (+38 lines)
1	--- src/nvidia/nvidia_ctl.c.orig 2021-08-02 23:24:19 UTC
2	+++ src/nvidia/nvidia_ctl.c
3	@@ -52,7 +52,7 @@ static int nvidia_ctl_open(
4	free(nvffp, M_NVIDIA);
5	return ENOMEM;
6	}
7	- mtx_init(&nvffp->fops_mtx, "fops_mtx", NULL, MTX_DEF);
8	+ sx_init(&nvffp->fops_sx, "fops_sx");
9
10	nvffp->nv = nv;
11	mtx_init(&nvffp->event_mtx, "event_mtx", NULL, (MTX_DEF \| MTX_RECURSE));
12	@@ -62,7 +62,7 @@ static int nvidia_ctl_open(
13
14	if (status != 0) {
15	mtx_destroy(&nvffp->event_mtx);
16	- mtx_destroy(&nvffp->fops_mtx);
17	+ sx_destroy(&nvffp->fops_sx);
18	NV_UMA_ZONE_FREE_STACK(nvffp->fops_sp);
19	free(nvffp, M_NVIDIA);
20	return status;
21	@@ -72,7 +72,7 @@ static int nvidia_ctl_open(
22	if (status != 0) {
23	nvidia_close_ctl(nv, nvffp);
24	mtx_destroy(&nvffp->event_mtx);
25	- mtx_destroy(&nvffp->fops_mtx);
26	+ sx_destroy(&nvffp->fops_sx);
27	NV_UMA_ZONE_FREE_STACK(nvffp->fops_sp);
28	free(nvffp, M_NVIDIA);
29	return status;
30	@@ -95,7 +95,7 @@ void nvidia_ctl_dtor(void *arg)
31	}
32	mtx_destroy(&nvffp->event_mtx);
33
34	- mtx_destroy(&nvffp->fops_mtx);
35	+ sx_destroy(&nvffp->fops_sx);
36	NV_UMA_ZONE_FREE_STACK(nvffp->fops_sp);
37
38	free(nvffp, M_NVIDIA);

Added Link Here

(-)b/x11/nvidia-driver/files/extra-patch-src_nvidia_nvidia__dev.c (+38 lines)
1	--- src/nvidia/nvidia_dev.c.orig 2021-08-02 23:24:33 UTC
2	+++ src/nvidia/nvidia_dev.c
3	@@ -49,7 +49,7 @@ static int nvidia_dev_open(
4	free(nvffp, M_NVIDIA);
5	return ENOMEM;
6	}
7	- mtx_init(&nvffp->fops_mtx, "fops_mtx", NULL, MTX_DEF);
8	+ sx_init(&nvffp->fops_sx, "fops_sx");
9
10	nvffp->nv = nv;
11	mtx_init(&nvffp->event_mtx, "event_mtx", NULL, (MTX_DEF \| MTX_RECURSE));
12	@@ -59,7 +59,7 @@ static int nvidia_dev_open(
13
14	if (status != 0) {
15	mtx_destroy(&nvffp->event_mtx);
16	- mtx_destroy(&nvffp->fops_mtx);
17	+ sx_destroy(&nvffp->fops_sx);
18	NV_UMA_ZONE_FREE_STACK(nvffp->fops_sp);
19	free(nvffp, M_NVIDIA);
20	return status;
21	@@ -69,7 +69,7 @@ static int nvidia_dev_open(
22	if (status != 0) {
23	nvidia_close_dev(nv, nvffp);
24	mtx_destroy(&nvffp->event_mtx);
25	- mtx_destroy(&nvffp->fops_mtx);
26	+ sx_destroy(&nvffp->fops_sx);
27	NV_UMA_ZONE_FREE_STACK(nvffp->fops_sp);
28	free(nvffp, M_NVIDIA);
29	return status;
30	@@ -92,7 +92,7 @@ void nvidia_dev_dtor(void *arg)
31	}
32	mtx_destroy(&nvffp->event_mtx);
33
34	- mtx_destroy(&nvffp->fops_mtx);
35	+ sx_destroy(&nvffp->fops_sx);
36	NV_UMA_ZONE_FREE_STACK(nvffp->fops_sp);
37
38	free(nvffp, M_NVIDIA);

Added Link Here

(-)b/x11/nvidia-driver/files/extra-patch-src_nvidia_nvidia__subr.c (+74 lines)
1	--- src/nvidia/nvidia_subr.c.orig 2021-08-02 23:24:25 UTC
2	+++ src/nvidia/nvidia_subr.c
3	@@ -397,7 +397,7 @@ int nvidia_handle_ioctl(
4	nr = xfer->cmd;
5	}
6
7	- mtx_lock(&nvffp->fops_mtx);
8	+ sx_xlock(&nvffp->fops_sx);
9	sp = nvffp->fops_sp;
10
11	switch (nr) {
12	@@ -471,7 +471,7 @@ int nvidia_handle_ioctl(
13	break;
14	}
15
16	- mtx_unlock(&nvffp->fops_mtx);
17	+ sx_xunlock(&nvffp->fops_sx);
18
19	if (args != (void *)data) {
20	if (copyout(args, NvP64_VALUE(xfer->ptr), size) != 0)
21	@@ -1048,7 +1048,7 @@ NV_STATUS NV_API_CALL nv_add_mapping_context_to_file(
22
23	nvffp = nv_get_nvffp_from_nvfp(nvfp);
24
25	- mtx_lock(&nvffp->fops_mtx);
26	+ sx_xlock(&nvffp->fops_sx);
27
28	nvamc = &nvffp->mmap_context;
29
30	@@ -1076,7 +1076,7 @@ NV_STATUS NV_API_CALL nv_add_mapping_context_to_file(
31	nvamc->valid = NV_TRUE;
32
33	done:
34	- mtx_unlock(&nvffp->fops_mtx);
35	+ sx_xunlock(&nvffp->fops_sx);
36	nv_put_file_private(priv);
37
38	return status;
39	@@ -1503,7 +1503,7 @@ int nvidia_mmap_ctl_single(
40	nv_alloc_mapping_context_t *mmap_context;
41	int status;
42
43	- mtx_lock(&nvffp->fops_mtx);
44	+ sx_xlock(&nvffp->fops_sx);
45
46	mmap_context = &nvffp->mmap_context;
47
48	@@ -1532,7 +1532,7 @@ int nvidia_mmap_ctl_single(
49	status = 0;
50
51	done:
52	- mtx_unlock(&nvffp->fops_mtx);
53	+ sx_xunlock(&nvffp->fops_sx);
54
55	return status;
56	}
57	@@ -1553,7 +1553,7 @@ int nvidia_mmap_dev_single(
58	nv = nvffp->nv;
59	sc = nv->os_state;
60
61	- mtx_lock(&nvffp->fops_mtx);
62	+ sx_xlock(&nvffp->fops_sx);
63
64	/*
65	* If no mmap context is valid on this file descriptor then this mapping
66	@@ -1593,7 +1593,7 @@ int nvidia_mmap_dev_single(
67	}
68
69	done:
70	- mtx_unlock(&nvffp->fops_mtx);
71	+ sx_xunlock(&nvffp->fops_sx);
72
73	return status;
74	}