mirror of
https://git.freebsd.org/ports.git
synced 2025-06-07 05:40:30 -04:00
6b8afacae7
particular hunk, and there are several unrelated changes in that file. While here, explain why LICENSE_FILE is set in the consumer ports.
109 lines
3.7 KiB
C
109 lines
3.7 KiB
C
--- 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/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
|
|
|
|
|
|
@@ -252,7 +254,12 @@ 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);
|
|
+ /*
|
|
+ * Initialize memory to avoid spurious "lock re-initialization" errors.
|
|
+ * A little more detail can be found in the PR 201340 starting around
|
|
+ * comment #50.
|
|
+ */
|
|
+ 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
|