diff options
| -rw-r--r-- | x11/nvidia-driver/Makefile | 37 | ||||
| -rw-r--r-- | x11/nvidia-driver/files/r246085-patch-src-nvidia_linux.c | 14 | ||||
| -rw-r--r-- | x11/nvidia-driver/files/r248084-patch-src-nv-freebsd.h | 10 | ||||
| -rw-r--r-- | x11/nvidia-driver/files/r248084-patch-src-nvidia_subr.c | 56 |
4 files changed, 27 insertions, 90 deletions
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 2a73fd4d30af..0cf774721481 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -12,11 +12,11 @@ PORTNAME= nvidia-driver DISTVERSION?= 310.32 -# Always try to set PORTREVISION as can be overridden by the slave ports +# Always try to set PORTREVISION as it can be overridden by the slave ports PORTREVISION?= 0 CATEGORIES= x11 kld MASTER_SITES= ${MASTER_SITE_NVIDIA} -# MASTER_SITE_SUBDIR has to be set later because it depends on NVVERSION +# MASTER_SITE_SUBDIR it set later because it depends on NVVERSION DISTNAME= NVIDIA-FreeBSD-x86${ARCH_SUFX}-${DISTVERSION} MAINTAINER= danfe@FreeBSD.org @@ -86,18 +86,11 @@ WBINVD_DESC= Flush CPU caches directly with WBINVD PLIST_SUB+= LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \ MODULESDIR=${MODULESDIR} -. if ${OSVERSION} > 1000028 -EXTRA_PATCHES+= ${FILESDIR}/r248084-patch-src-nv-freebsd.h -EXTRA_PATCHES+= ${FILESDIR}/r248084-patch-src-nvidia_subr.c -. endif .if ${PORT_OPTIONS:MLINUX} CONFLICTS= linux[-_]dri-[0-9]* linux-f10-dri-[0-9]* USE_LINUX= yes PLIST_SUB+= LINUX="" -. if ${OSVERSION} > 1000026 -EXTRA_PATCHES+= ${FILESDIR}/r246085-patch-src-nvidia_linux.c -. endif .else PLIST_SUB+= LINUX="@comment " # Propagate WITHOUT_LINUX variable down to inner Makefiles @@ -109,24 +102,48 @@ IGNORE= requires fairly recent FreeBSD-STABLE, or FreeBSD-CURRENT .endif .if ${NVVERSION} < 1952200 +# ABI version is hardcoded inside the binary, so better be explicit here LIB_DEPENDS= m.3:${PORTSDIR}/misc/compat5x .endif post-patch: .SILENT # We should support -CURRENT: kill the check ${REINPLACE_CMD} -e '24,26d' ${WRKSRC}/src/nv-freebsd.h -# Adjust legacy drivers for updated d_mmap() since early 9.X +# Adjust legacy drivers for updated d_mmap() since FreeBSD src SVN r201223 .if ${OSVERSION} > 900005 && ${NVVERSION} < 1952200 ${REINPLACE_CMD} -e 's/vm_offset_t offset/vm_ooffset_t offset/ ; \ s/vm_offset_t \*address/vm_paddr_t *address/ ; \ s/int nprot/&, vm_memattr_t *memattr/' \ ${WRKSRC}/src/nvidia_dev.c .endif +# In the legacy drivers: remove paqe queue locking and add page locking +# around vm_page_(un)wire() after FreeBSD src SVN r207410, r207617, and +# r207644; also remove paqe queue locking around vm_page_wakeup() after +# FreeBSD src SVN r163622 +.if ${OSVERSION} > 900011 && ${NVVERSION} < 3046400 + ${REINPLACE_CMD} -E '/vm_page_(un)?lock_queues\(\);/d ; \ + s/(vm_page_(un)?wire\()([^,]+)(, 0)?(\);)/vm_page_lock(\3); & vm_page_unlock(\3);/' \ + ${WRKSRC}/src/nvidia_subr.c +.endif # Catch up legacy drivers with FreeBSD src SVN r225617 .if ${OSVERSION} > 900043 && ${NVVERSION} < 1952200 ${REINPLACE_CMD} -e '/return/s/ioctl/sys_&/' \ ${WRKSRC}/src/nvidia_linux.c .endif +# Adjust Linux headers #include's after FreeBSD src SVN r246085 +.if ${OSVERSION} > 1000027 && ${NVVERSION} >= 964323 + ${REINPLACE_CMD} -E '/#include "machine\/\.\.\/linux(32)?\/linux.h"/ \ + { x ; s/.*/#include "machine\/..\/..\/compat\/linux\/linux_ioctl.h"/ ; H ; x ; }' \ + ${WRKSRC}/src/nvidia_linux.c +.endif +# Adjust vm_object locking after FreeBSD src SVN r248084 +.if ${OSVERSION} > 1000029 + ${REINPLACE_CMD} -e '/#include <vm\/vm_object.h>/ \ + { x ; s/.*/#include <sys\/rwlock.h>/ ; G ; }' \ + ${WRKSRC}/src/nv-freebsd.h + ${REINPLACE_CMD} -E 's/(VM_OBJECT_)(UN)?(LOCK)/\1W\2\3/' \ + ${WRKSRC}/src/nvidia_subr.c +.endif # Process OPTIONS .if ${PORT_OPTIONS:MFREEBSD_AGP} ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \ diff --git a/x11/nvidia-driver/files/r246085-patch-src-nvidia_linux.c b/x11/nvidia-driver/files/r246085-patch-src-nvidia_linux.c deleted file mode 100644 index a219613312e3..000000000000 --- a/x11/nvidia-driver/files/r246085-patch-src-nvidia_linux.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/nvidia_linux.c.orig 2012-10-30 13:54:06.000000000 -0400 -+++ src/nvidia_linux.c 2013-02-13 19:48:17.000000000 -0500 -@@ -21,9 +21,11 @@ - #if defined(NVCPU_X86) - #include "machine/../linux/linux.h" - #include "machine/../linux/linux_proto.h" -+#include "machine/../../compat/linux/linux_ioctl.h" - #elif defined(NVCPU_X86_64) - #include "machine/../linux32/linux.h" - #include "machine/../linux32/linux32_proto.h" -+#include "machine/../../compat/linux/linux_ioctl.h" - #endif - - int linux_ioctl_nvidia(d_thread_t *, struct linux_ioctl_args *); diff --git a/x11/nvidia-driver/files/r248084-patch-src-nv-freebsd.h b/x11/nvidia-driver/files/r248084-patch-src-nv-freebsd.h deleted file mode 100644 index ed695fb84ad3..000000000000 --- a/x11/nvidia-driver/files/r248084-patch-src-nv-freebsd.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/nv-freebsd.h.orig 2013-01-14 14:38:44.000000000 -0800 -+++ src/nv-freebsd.h 2013-03-09 06:36:23.000000000 -0800 -@@ -77,6 +77,7 @@ - #include <vm/vm_object.h> - #include <vm/pmap.h> - #include <vm/vm_map.h> -+#include <sys/rwlock.h> - #include <vm/vm_pager.h> - #include <vm/uma.h> - diff --git a/x11/nvidia-driver/files/r248084-patch-src-nvidia_subr.c b/x11/nvidia-driver/files/r248084-patch-src-nvidia_subr.c deleted file mode 100644 index 0bd908eb0cc1..000000000000 --- a/x11/nvidia-driver/files/r248084-patch-src-nvidia_subr.c +++ /dev/null @@ -1,56 +0,0 @@ ---- src/nvidia_subr.c.orig 2013-01-14 14:38:44.000000000 -0800 -+++ src/nvidia_subr.c 2013-03-09 06:47:05.000000000 -0800 -@@ -83,7 +83,7 @@ - if (!sc->BAR_objects[i]) - goto failed; - -- VM_OBJECT_LOCK(sc->BAR_objects[i]); -+ VM_OBJECT_WLOCK(sc->BAR_objects[i]); - switch (i) { - case NV_GPU_BAR_INDEX_FB: - vm_object_set_memattr(sc->BAR_objects[i], -@@ -95,7 +95,7 @@ - VM_MEMATTR_UNCACHEABLE); - break; - } -- VM_OBJECT_UNLOCK(sc->BAR_objects[i]); -+ VM_OBJECT_WUNLOCK(sc->BAR_objects[i]); - } - } - -@@ -541,9 +541,9 @@ - goto failed; - } - -- VM_OBJECT_LOCK(sc->UD_object); -+ VM_OBJECT_WLOCK(sc->UD_object); - vm_object_set_memattr(sc->UD_object, VM_MEMATTR_UNCACHEABLE); -- VM_OBJECT_UNLOCK(sc->UD_object); -+ VM_OBJECT_WUNLOCK(sc->UD_object); - } - - nv->flags |= NV_FLAG_OPEN; -@@ -965,9 +965,9 @@ - goto failed; - } - -- VM_OBJECT_LOCK(at->object); -+ VM_OBJECT_WLOCK(at->object); - vm_object_set_memattr(at->object, attr); -- VM_OBJECT_UNLOCK(at->object); -+ VM_OBJECT_WUNLOCK(at->object); - - *private = at; - SLIST_INSERT_HEAD(&sc->alloc_list, at, list); -@@ -1108,9 +1108,9 @@ - goto failed; - } - -- VM_OBJECT_LOCK(at->object); -+ VM_OBJECT_WLOCK(at->object); - vm_object_set_memattr(at->object, attr); -- VM_OBJECT_UNLOCK(at->object); -+ VM_OBJECT_WUNLOCK(at->object); - - *private = at; - SLIST_INSERT_HEAD(&sc->alloc_list, at, list); |