.if ${NVVERSION} >= 450.057

		extra-patch-450-src-nvidia_ctl.c \

		extra-patch-src-nvidia_dev.c \

		extra-patch-src-nvidia_linux.c \

		extra-patch-src-nvidia_pci.c

.else

SUB_PATCHES=	extra-patch-src-Makefile \

		extra-patch-src-nv-freebsd.h \

		extra-patch-src-nv-misc.h \

.endif

--- src/nvidia-modeset/nvidia-modeset-freebsd.c.orig	2018-08-21 23:09:28 UTC

+++ src/nvidia-modeset/nvidia-modeset-freebsd.c

@@ -26,6 +26,7 @@

 #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"

@@ -48,6 +49,7 @@

     #include "machine/../linux32/linux32_proto.h"

   #endif

   #include <compat/linux/linux_ioctl.h>

+  #include <compat/linux/linux_util.h>

 #endif

@@ -250,7 +252,7 @@ struct nvkms_ref_ptr {

 struct nvkms_ref_ptr* NVKMS_API_CALL nvkms_alloc_ref_ptr(void *ptr)

 {

-    struct nvkms_ref_ptr *ref_ptr = nvkms_alloc(sizeof(*ref_ptr), NV_FALSE);

+    struct nvkms_ref_ptr *ref_ptr = nvkms_alloc(sizeof(*ref_ptr), NV_TRUE);

     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(

  *************************************************************************/

 #if defined(NVKMS_SUPPORT_LINUX_COMPAT)

+static struct linux_device_handler nvkms_linux_device_handler = {

+    .bsd_driver_name = "nvidia-modeset",

+    .linux_driver_name = "nvidia-modeset",

+    .bsd_device_name = "nvidia-modeset",

+    .linux_device_name = "nvidia-modeset",

+    .linux_major = 195,

+    .linux_minor = 254,

+    .linux_char_device = 1

+};

 static int nvkms_linux_ioctl_function(

     struct thread *td,

     struct linux_ioctl_args *args

 )

 {

-    struct file *fp;

-    int status;

-    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;

+    if ((args->cmd & (1<<29)) != 0) {

+        /* FreeBSD has only 13 bits to encode the size. */

+        printf("nvidia: pid %d (%s): ioctl cmd=0x%x size too large\n",

+            (int)td->td_proc->p_pid, td->td_proc->p_comm, args->cmd);

+        return (EINVAL);

     }

-

-    cmd = args->cmd;

-

-    status = fo_ioctl(fp, cmd, (caddr_t)args->arg, td->td_ucred, td);

-    fdrop(fp, td);

-

-    return status;

+    args->cmd = (args->cmd & ~IOC_DIRMASK) | dir[args->cmd >> 30];

+    return (sys_ioctl(td, (struct ioctl_args *)args));

 }

 #define NVKMS_LINUX_IOCTL_MIN _IOC(0, NVKMS_IOCTL_MAGIC, NVKMS_IOCTL_CMD, 0)

@@ -909,6 +909,7 @@ static struct linux_ioctl_handler nvkms_linux_ioctl_ha

 static void nvkms_linux_compat_load(void)

 {

 #if defined(NVKMS_SUPPORT_LINUX_COMPAT)

+    linux_device_register_handler(&nvkms_linux_device_handler);

     linux_ioctl_register_handler(&nvkms_linux_ioctl_handler);

 #endif

 }

@@ -917,6 +918,7 @@ static void nvkms_linux_compat_unload(void)

 {

 #if defined(NVKMS_SUPPORT_LINUX_COMPAT)

     linux_ioctl_unregister_handler(&nvkms_linux_ioctl_handler);

+    linux_device_unregister_handler(&nvkms_linux_device_handler);

 #endif

 }

@@ -1100,4 +1102,9 @@ MODULE_DEPEND(nvidia_modeset,               /* module 

 MODULE_DEPEND(nvidia_modeset,               /* module name */

               linux,                        /* prerequisite module */

               1, 1, 1);                     /* vmin, vpref, vmax */

+#if defined(NVCPU_X86_64)

+MODULE_DEPEND(nvidia_modeset,               /* module name */

+              linux_common,                 /* prerequisite module */

+              1, 1, 1);                     /* vmin, vpref, vmax */

+#endif

 #endif

--- src/%%NVSRC%%/nvidia_ctl.c.orig	2017-09-14 20:46:30 UTC

+++ src/%%NVSRC%%/nvidia_ctl.c

@@ -13,6 +13,12 @@

 #include "nv.h"

 #include "nv-freebsd.h"

+#ifdef NV_SUPPORT_LINUX_COMPAT /* (COMPAT_LINUX || COMPAT_LINUX32) */

+#include <compat/linux/linux_util.h>

+

+const char nvidia_driver_name[] = "nvidia";

+#endif

+

 static d_open_t  nvidia_ctl_open;

 static void nvidia_ctl_dtor(void *arg);

 static d_ioctl_t nvidia_ctl_ioctl;

@@ -138,6 +144,18 @@ static int nvidia_ctl_poll(

 int nvidia_ctl_attach(void)

 {

+#ifdef NV_SUPPORT_LINUX_COMPAT

+    struct linux_device_handler nvidia_ctl_linux_handler = {

+        .bsd_driver_name = __DECONST(char *, nvidia_driver_name),

+        .linux_driver_name = __DECONST(char *, nvidia_driver_name),

+        .bsd_device_name = __DECONST(char *, nvidia_ctl_cdevsw.d_name),

+        .linux_device_name = __DECONST(char *, nvidia_ctl_cdevsw.d_name),

+        .linux_major = NV_MAJOR_DEVICE_NUMBER,

+        .linux_minor = 255,

+        .linux_char_device = 1

+    };

+#endif

+

     if (nvidia_count == 0) {

         nvidia_ctl_cdev = make_dev(&nvidia_ctl_cdevsw,

                 CDEV_CTL_MINOR,

@@ -145,6 +163,10 @@ int nvidia_ctl_attach(void)

                 "%s", nvidia_ctl_cdevsw.d_name);

         if (nvidia_ctl_cdev == NULL)

             return ENOMEM;

+

+#ifdef NV_SUPPORT_LINUX_COMPAT

+        (void)linux_device_register_handler(&nvidia_ctl_linux_handler);

+#endif

     }

     nvidia_count++;

@@ -153,10 +175,25 @@ int nvidia_ctl_attach(void)

 int nvidia_ctl_detach(void)

 {

+#ifdef NV_SUPPORT_LINUX_COMPAT

+    struct linux_device_handler nvidia_ctl_linux_handler = {

+        .bsd_driver_name = __DECONST(char *, nvidia_driver_name),

+        .linux_driver_name = __DECONST(char *, nvidia_driver_name),

+        .bsd_device_name = __DECONST(char *, nvidia_ctl_cdevsw.d_name),

+        .linux_device_name = __DECONST(char *, nvidia_ctl_cdevsw.d_name),

+        .linux_major = NV_MAJOR_DEVICE_NUMBER,

+        .linux_minor = 255,

+        .linux_char_device = 1

+    };

+#endif

     nvidia_count--;

-    if (nvidia_count == 0)

+    if (nvidia_count == 0) {

+#ifdef NV_SUPPORT_LINUX_COMPAT

+        (void)linux_device_unregister_handler(&nvidia_ctl_linux_handler);

+#endif

         destroy_dev(nvidia_ctl_cdev);

+    }

     return 0;

 }