View | Details | Raw Unified | Return to bug 238018
Collapse All | Expand All

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

Return to bug 238018