Date: Thursday, August 25, 2016 @ 13:42:09 Author: svenstaro Revision: 274640
archrelease: copy trunk to testing-i686, testing-x86_64 Added: nvidia/repos/testing-i686/PKGBUILD (from rev 274639, nvidia/trunk/PKGBUILD) nvidia/repos/testing-i686/fix-abi.patch (from rev 274639, nvidia/trunk/fix-abi.patch) nvidia/repos/testing-i686/nvidia.install (from rev 274639, nvidia/trunk/nvidia.install) nvidia/repos/testing-x86_64/PKGBUILD (from rev 274639, nvidia/trunk/PKGBUILD) nvidia/repos/testing-x86_64/fix-abi.patch (from rev 274639, nvidia/trunk/fix-abi.patch) nvidia/repos/testing-x86_64/nvidia.install (from rev 274639, nvidia/trunk/nvidia.install) Deleted: nvidia/repos/testing-i686/0001-linux-4.7-i686.patch nvidia/repos/testing-i686/0001-linux-4.7-x86_64.patch nvidia/repos/testing-i686/PKGBUILD nvidia/repos/testing-i686/nvidia.install nvidia/repos/testing-x86_64/0001-linux-4.7-i686.patch nvidia/repos/testing-x86_64/0001-linux-4.7-x86_64.patch nvidia/repos/testing-x86_64/PKGBUILD nvidia/repos/testing-x86_64/nvidia.install --------------------------------------------+ /PKGBUILD | 178 +++++++++++++++++++++++++++ /nvidia.install | 26 +++ testing-i686/0001-linux-4.7-i686.patch | 46 ------ testing-i686/0001-linux-4.7-x86_64.patch | 64 --------- testing-i686/PKGBUILD | 89 ------------- testing-i686/fix-abi.patch | 12 + testing-i686/nvidia.install | 13 - testing-x86_64/0001-linux-4.7-i686.patch | 46 ------ testing-x86_64/0001-linux-4.7-x86_64.patch | 74 ----------- testing-x86_64/PKGBUILD | 85 ------------ testing-x86_64/fix-abi.patch | 12 + testing-x86_64/nvidia.install | 13 - 12 files changed, 228 insertions(+), 430 deletions(-) Deleted: testing-i686/0001-linux-4.7-i686.patch =================================================================== --- testing-i686/0001-linux-4.7-i686.patch 2016-08-25 13:41:59 UTC (rev 274639) +++ testing-i686/0001-linux-4.7-i686.patch 2016-08-25 13:42:09 UTC (rev 274640) @@ -1,46 +0,0 @@ -diff -u -r nvidia-367.35-orig/nvidia-drm/nvidia-drm-fb.c nvidia-367.35/nvidia-drm/nvidia-drm-fb.c ---- nvidia-367.35-orig/nvidia-drm/nvidia-drm-fb.c 2016-07-15 18:58:50.000000000 +0200 -+++ nvidia-367.35/nvidia-drm/nvidia-drm-fb.c 2016-08-06 00:38:00.550651165 +0200 -@@ -31,6 +31,7 @@ - #include "nvidia-drm-gem.h" - - #include <drm/drm_crtc_helper.h> -+#include <linux/version.h> - - static void nvidia_framebuffer_destroy(struct drm_framebuffer *fb) - { -@@ -114,7 +115,11 @@ - * We don't support any planar format, pick up first buffer only. - */ - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) -+ gem = drm_gem_object_lookup(file, cmd->handles[0]); -+#else - gem = drm_gem_object_lookup(dev, file, cmd->handles[0]); -+#endif - - if (gem == NULL) - { -diff -u -r nvidia-367.35-orig/nvidia-drm/nvidia-drm-gem.c nvidia-367.35/nvidia-drm/nvidia-drm-gem.c ---- nvidia-367.35-orig/nvidia-drm/nvidia-drm-gem.c 2016-07-15 18:58:50.000000000 +0200 -+++ nvidia-367.35/nvidia-drm/nvidia-drm-gem.c 2016-08-06 00:37:47.237546102 +0200 -@@ -27,6 +27,7 @@ - #include "nvidia-drm-priv.h" - #include "nvidia-drm-ioctl.h" - #include "nvidia-drm-gem.h" -+#include <linux/version.h> - - static struct nvidia_drm_gem_object *nvidia_drm_gem_new - ( -@@ -408,7 +409,11 @@ - - mutex_lock(&dev->struct_mutex); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) -+ gem = drm_gem_object_lookup(file, handle); -+#else - gem = drm_gem_object_lookup(dev, file, handle); -+#endif - - if (gem == NULL) - { Deleted: testing-i686/0001-linux-4.7-x86_64.patch =================================================================== --- testing-i686/0001-linux-4.7-x86_64.patch 2016-08-25 13:41:59 UTC (rev 274639) +++ testing-i686/0001-linux-4.7-x86_64.patch 2016-08-25 13:42:09 UTC (rev 274640) @@ -1,64 +0,0 @@ -diff -u -r nvidia-367.35-orig/nvidia-drm/nvidia-drm-fb.c nvidia-367.35/nvidia-drm/nvidia-drm-fb.c ---- nvidia-367.35-orig/nvidia-drm/nvidia-drm-fb.c 2016-07-15 18:58:50.000000000 +0200 -+++ nvidia-367.35/nvidia-drm/nvidia-drm-fb.c 2016-08-06 00:38:00.550651165 +0200 -@@ -31,6 +31,7 @@ - #include "nvidia-drm-gem.h" - - #include <drm/drm_crtc_helper.h> -+#include <linux/version.h> - - static void nvidia_framebuffer_destroy(struct drm_framebuffer *fb) - { -@@ -114,7 +115,11 @@ - * We don't support any planar format, pick up first buffer only. - */ - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) -+ gem = drm_gem_object_lookup(file, cmd->handles[0]); -+#else - gem = drm_gem_object_lookup(dev, file, cmd->handles[0]); -+#endif - - if (gem == NULL) - { -diff -u -r nvidia-367.35-orig/nvidia-drm/nvidia-drm-gem.c nvidia-367.35/nvidia-drm/nvidia-drm-gem.c ---- nvidia-367.35-orig/nvidia-drm/nvidia-drm-gem.c 2016-07-15 18:58:50.000000000 +0200 -+++ nvidia-367.35/nvidia-drm/nvidia-drm-gem.c 2016-08-06 00:37:47.237546102 +0200 -@@ -27,6 +27,7 @@ - #include "nvidia-drm-priv.h" - #include "nvidia-drm-ioctl.h" - #include "nvidia-drm-gem.h" -+#include <linux/version.h> - - static struct nvidia_drm_gem_object *nvidia_drm_gem_new - ( -@@ -408,7 +409,11 @@ - - mutex_lock(&dev->struct_mutex); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) -+ gem = drm_gem_object_lookup(file, handle); -+#else - gem = drm_gem_object_lookup(dev, file, handle); -+#endif - - if (gem == NULL) - { -diff -u -r nvidia-367.35-orig/nvidia-uvm/uvm_linux.h nvidia-367.35/nvidia-uvm/uvm_linux.h ---- nvidia-367.35-orig/nvidia-uvm/uvm_linux.h 2016-07-15 18:58:50.000000000 +0200 -+++ nvidia-367.35/nvidia-uvm/uvm_linux.h 2016-08-06 00:27:09.796678527 +0200 -@@ -554,12 +554,13 @@ - INIT_RADIX_TREE(tree, GFP_NOWAIT); - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0) - static bool radix_tree_empty(struct radix_tree_root *tree) - { - void *dummy; - return radix_tree_gang_lookup(tree, &dummy, 0, 1) == 0; - } -- -+#endif - - #if !defined(NV_USLEEP_RANGE_PRESENT) - static void __sched usleep_range(unsigned long min, unsigned long max) Deleted: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2016-08-25 13:41:59 UTC (rev 274639) +++ testing-i686/PKGBUILD 2016-08-25 13:42:09 UTC (rev 274640) @@ -1,89 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Thomas Baechler <tho...@archlinux.org> - -pkgbase=nvidia -pkgname=(nvidia nvidia-dkms) -pkgver=367.35 -_extramodules=extramodules-4.7-ARCH -pkgrel=3 -pkgdesc="NVIDIA drivers for linux" -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.7' 'linux-headers<4.8') -license=('custom') -options=('!strip') -source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" - "0001-linux-4.7-i686.patch") -source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" - "0001-linux-4.7-x86_64.patch") -md5sums_i686=('42db6f6485c3c337c7c756380ec64b7a' - '0ceb49f5c537ae60743fdf7177eb996e') -md5sums_x86_64=('24f1fc19fe10bcc6ff264fb5034c4ccc' - 'b1e6760dca837e8685fd02be15aa4f51') - -[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" -[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" - -prepare() { - sh "${_pkg}.run" --extract-only - cd "${_pkg}" - - patch -Np1 -d kernel < ../0001-linux-4.7-${CARCH}.patch - cp -a kernel kernel-dkms - cd kernel-dkms - sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf - sed -i 's/__JOBS/`nproc`/' dkms.conf - sed -i 's/__DKMS_MODULES//' dkms.conf - sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\ -DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\ -BUILT_MODULE_NAME[1]="nvidia-uvm"\ -DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\ -BUILT_MODULE_NAME[2]="nvidia-modeset"\ -DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\ -BUILT_MODULE_NAME[3]="nvidia-drm"\ -DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf -} - -build() { - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - cd "${_pkg}"/kernel - make SYSSRC=/usr/lib/modules/"${_kernver}/build" module -} - -package_nvidia() { - pkgdesc="NVIDIA drivers for linux" - depends=('linux>=4.7' 'linux<4.8' "nvidia-utils=${pkgver}" 'libgl') - install=nvidia.install - - install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" - install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-modeset.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-modeset.ko" - install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-drm.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-drm.ko" - - if [[ "$CARCH" = "x86_64" ]]; then - install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko" - fi - - gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko - install -d -m755 "${pkgdir}/usr/lib/modprobe.d" - - echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" -} - -package_nvidia-dkms() { - pkgdesc="NVIDIA driver sources for linux" - depends=('dkms' "nvidia-utils=$pkgver" 'libgl') - optdepends=('linux-headers: Build the module for Arch kernel' - 'linux-lts-headers: Build the module for LTS Arch kernel') - conflicts+=('nvidia') - - cd ${_pkg} - install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src} - cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}" - echo 'blacklist nouveau' > "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" -} Copied: nvidia/repos/testing-i686/PKGBUILD (from rev 274639, nvidia/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2016-08-25 13:42:09 UTC (rev 274640) @@ -0,0 +1,89 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Thomas Baechler <tho...@archlinux.org> + +pkgbase=nvidia +pkgname=(nvidia nvidia-dkms) +pkgver=370.23 +_extramodules=extramodules-4.7-ARCH +pkgrel=4 +pkgdesc="NVIDIA drivers for linux" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.7' 'linux-headers<4.8') +license=('custom') +options=('!strip') +source=(fix-abi.patch) +source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") +source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") +md5sums=('4ce4db437695790a73f132651a601889') +md5sums_i686=('7b7466e23ae6ffa97106c9749aee2628') +md5sums_x86_64=('cbe2cee787e07f8775a3fd994c9263a9') + +[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" +[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" + +prepare() { + sh "${_pkg}.run" --extract-only + cd "${_pkg}" + + # patches here + patch -Np0 -i ../fix-abi.patch + + cp -a kernel kernel-dkms + cd kernel-dkms + sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf + sed -i 's/__JOBS/`nproc`/' dkms.conf + sed -i 's/__DKMS_MODULES//' dkms.conf + sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\ +DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\ +BUILT_MODULE_NAME[1]="nvidia-uvm"\ +DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\ +BUILT_MODULE_NAME[2]="nvidia-modeset"\ +DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\ +BUILT_MODULE_NAME[3]="nvidia-drm"\ +DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf +} + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${_pkg}"/kernel + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module +} + +package_nvidia() { + pkgdesc="NVIDIA drivers for linux" + depends=('linux>=4.7' 'linux<4.8' "nvidia-utils=${pkgver}" 'libgl') + install=nvidia.install + + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-modeset.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-modeset.ko" + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-drm.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-drm.ko" + + if [[ "$CARCH" = "x86_64" ]]; then + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko" + fi + + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko + install -d -m755 "${pkgdir}/usr/lib/modprobe.d" + + echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" +} + +package_nvidia-dkms() { + pkgdesc="NVIDIA driver sources for linux" + depends=('dkms' "nvidia-utils=$pkgver" 'libgl') + optdepends=('linux-headers: Build the module for Arch kernel' + 'linux-lts-headers: Build the module for LTS Arch kernel') + conflicts+=('nvidia') + + cd ${_pkg} + install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src} + cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}" + echo 'blacklist nouveau' > "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" +} Copied: nvidia/repos/testing-i686/fix-abi.patch (from rev 274639, nvidia/trunk/fix-abi.patch) =================================================================== --- testing-i686/fix-abi.patch (rev 0) +++ testing-i686/fix-abi.patch 2016-08-25 13:42:09 UTC (rev 274640) @@ -0,0 +1,12 @@ +diff -u -r kernel/nvidia-drm/nvidia-drm-fence.c kernel-patched/nvidia-drm/nvidia-drm-fence.c +--- kernel/nvidia-drm/nvidia-drm-fence.c 2016-08-09 01:43:19.000000000 +0200 ++++ kernel-patched/nvidia-drm/nvidia-drm-fence.c 2016-08-25 14:31:34.419655564 +0200 +@@ -325,7 +325,7 @@ + struct nvidia_drm_gem_object *nv_gem; + }; + +-static void nvidia_drm_gem_prime_soft_fence_event ++static void NVKMS_KAPI_CALL nvidia_drm_gem_prime_soft_fence_event + ( + void *dataPtr, + NvU32 dataU32 Deleted: testing-i686/nvidia.install =================================================================== --- testing-i686/nvidia.install 2016-08-25 13:41:59 UTC (rev 274639) +++ testing-i686/nvidia.install 2016-08-25 13:42:09 UTC (rev 274640) @@ -1,13 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-4.7-ARCH' - depmod $(cat /usr/lib/modules/${EXTRAMODULES}/version) - echo 'In order to use nvidia module, reboot the system.' -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: nvidia/repos/testing-i686/nvidia.install (from rev 274639, nvidia/trunk/nvidia.install) =================================================================== --- testing-i686/nvidia.install (rev 0) +++ testing-i686/nvidia.install 2016-08-25 13:42:09 UTC (rev 274640) @@ -0,0 +1,13 @@ +post_install() { + EXTRAMODULES='extramodules-4.7-ARCH' + depmod $(cat /usr/lib/modules/${EXTRAMODULES}/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: testing-x86_64/0001-linux-4.7-i686.patch =================================================================== --- testing-x86_64/0001-linux-4.7-i686.patch 2016-08-25 13:41:59 UTC (rev 274639) +++ testing-x86_64/0001-linux-4.7-i686.patch 2016-08-25 13:42:09 UTC (rev 274640) @@ -1,46 +0,0 @@ -diff -u -r nvidia-367.35-orig/nvidia-drm/nvidia-drm-fb.c nvidia-367.35/nvidia-drm/nvidia-drm-fb.c ---- nvidia-367.35-orig/nvidia-drm/nvidia-drm-fb.c 2016-07-15 18:58:50.000000000 +0200 -+++ nvidia-367.35/nvidia-drm/nvidia-drm-fb.c 2016-08-06 00:38:00.550651165 +0200 -@@ -31,6 +31,7 @@ - #include "nvidia-drm-gem.h" - - #include <drm/drm_crtc_helper.h> -+#include <linux/version.h> - - static void nvidia_framebuffer_destroy(struct drm_framebuffer *fb) - { -@@ -114,7 +115,11 @@ - * We don't support any planar format, pick up first buffer only. - */ - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) -+ gem = drm_gem_object_lookup(file, cmd->handles[0]); -+#else - gem = drm_gem_object_lookup(dev, file, cmd->handles[0]); -+#endif - - if (gem == NULL) - { -diff -u -r nvidia-367.35-orig/nvidia-drm/nvidia-drm-gem.c nvidia-367.35/nvidia-drm/nvidia-drm-gem.c ---- nvidia-367.35-orig/nvidia-drm/nvidia-drm-gem.c 2016-07-15 18:58:50.000000000 +0200 -+++ nvidia-367.35/nvidia-drm/nvidia-drm-gem.c 2016-08-06 00:37:47.237546102 +0200 -@@ -27,6 +27,7 @@ - #include "nvidia-drm-priv.h" - #include "nvidia-drm-ioctl.h" - #include "nvidia-drm-gem.h" -+#include <linux/version.h> - - static struct nvidia_drm_gem_object *nvidia_drm_gem_new - ( -@@ -408,7 +409,11 @@ - - mutex_lock(&dev->struct_mutex); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) -+ gem = drm_gem_object_lookup(file, handle); -+#else - gem = drm_gem_object_lookup(dev, file, handle); -+#endif - - if (gem == NULL) - { Deleted: testing-x86_64/0001-linux-4.7-x86_64.patch =================================================================== --- testing-x86_64/0001-linux-4.7-x86_64.patch 2016-08-25 13:41:59 UTC (rev 274639) +++ testing-x86_64/0001-linux-4.7-x86_64.patch 2016-08-25 13:42:09 UTC (rev 274640) @@ -1,74 +0,0 @@ -diff -u --recursive NVIDIA-Linux-x86_64-367.36.02/kernel/nvidia-drm/nvidia-drm-drv.c patched_NVIDIA-Linux-x86_64-367.36.02/kernel/nvidia-drm/nvidia-drm-drv.c ---- NVIDIA-Linux-x86_64-367.36.02/kernel/nvidia-drm/nvidia-drm-drv.c 2016-07-25 13:23:10.000000000 +0200 -+++ patched_NVIDIA-Linux-x86_64-367.36.02/kernel/nvidia-drm/nvidia-drm-drv.c 2016-08-02 17:09:53.500398878 +0200 -@@ -36,6 +36,7 @@ - #include "nvidia-drm-ioctl.h" - - #include <drm/drmP.h> -+#include <drm/drm_auth.h> - - #include <drm/drm_crtc_helper.h> - -@@ -419,7 +420,7 @@ - - static - void nvidia_drm_master_drop(struct drm_device *dev, -- struct drm_file *file_priv, bool from_release) -+ struct drm_file *file_priv) - { - struct nvidia_drm_device *nv_dev = dev->dev_private; - int ret; -@@ -452,7 +453,7 @@ - mutex_lock(&dev->master_mutex); - - if (!file_priv->is_master || -- !file_priv->minor->master) -+ !file_priv->master) - { - goto done; - } -@@ -473,7 +474,7 @@ - * NVKMS modeset ownership, because nvidia_drm_master_set()'s call to - * grabOwnership() will fail. - */ -- drm_master_put(&file_priv->minor->master); -+ drm_master_put(&file_priv->master); - file_priv->is_master = 0; - - ret = 0; -diff -u --recursive NVIDIA-Linux-x86_64-367.36.02/kernel/nvidia-drm/nvidia-drm-fb.c patched_NVIDIA-Linux-x86_64-367.36.02/kernel/nvidia-drm/nvidia-drm-fb.c ---- NVIDIA-Linux-x86_64-367.36.02/kernel/nvidia-drm/nvidia-drm-fb.c 2016-07-25 13:23:10.000000000 +0200 -+++ patched_NVIDIA-Linux-x86_64-367.36.02/kernel/nvidia-drm/nvidia-drm-fb.c 2016-07-31 05:37:57.013950532 +0200 -@@ -114,7 +114,7 @@ - * We don't support any planar format, pick up first buffer only. - */ - -- gem = drm_gem_object_lookup(dev, file, cmd->handles[0]); -+ gem = drm_gem_object_lookup(file, cmd->handles[0]); - - if (gem == NULL) - { -diff -u --recursive NVIDIA-Linux-x86_64-367.36.02/kernel/nvidia-drm/nvidia-drm-gem.c patched_NVIDIA-Linux-x86_64-367.36.02/kernel/nvidia-drm/nvidia-drm-gem.c ---- NVIDIA-Linux-x86_64-367.36.02/kernel/nvidia-drm/nvidia-drm-gem.c 2016-07-25 13:23:10.000000000 +0200 -+++ patched_NVIDIA-Linux-x86_64-367.36.02/kernel/nvidia-drm/nvidia-drm-gem.c 2016-07-31 05:37:57.013950532 +0200 -@@ -408,7 +408,7 @@ - - mutex_lock(&dev->struct_mutex); - -- gem = drm_gem_object_lookup(dev, file, handle); -+ gem = drm_gem_object_lookup(file, handle); - - if (gem == NULL) - { -diff -u --recursive NVIDIA-Linux-x86_64-367.36.02/kernel/nvidia-drm/nvidia-drm-modeset.c patched_NVIDIA-Linux-x86_64-367.36.02/kernel/nvidia-drm/nvidia-drm-modeset.c ---- NVIDIA-Linux-x86_64-367.36.02/kernel/nvidia-drm/nvidia-drm-modeset.c 2016-07-25 13:23:10.000000000 +0200 -+++ patched_NVIDIA-Linux-x86_64-367.36.02/kernel/nvidia-drm/nvidia-drm-modeset.c 2016-08-02 17:14:57.895422720 +0200 -@@ -675,7 +675,7 @@ - goto failed; - } - -- drm_atomic_helper_swap_state(dev, state); -+ drm_atomic_helper_swap_state(state, true); - - nvidia_drm_update_head_mode_config(state, requested_config); - Deleted: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2016-08-25 13:41:59 UTC (rev 274639) +++ testing-x86_64/PKGBUILD 2016-08-25 13:42:09 UTC (rev 274640) @@ -1,85 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Thomas Baechler <tho...@archlinux.org> - -pkgbase=nvidia -pkgname=(nvidia nvidia-dkms) -pkgver=370.23 -_extramodules=extramodules-4.7-ARCH -pkgrel=2 -pkgdesc="NVIDIA drivers for linux" -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.7' 'linux-headers<4.8') -license=('custom') -options=('!strip') -source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") -source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -md5sums_i686=('7b7466e23ae6ffa97106c9749aee2628') -md5sums_x86_64=('cbe2cee787e07f8775a3fd994c9263a9') - -[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" -[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" - -prepare() { - sh "${_pkg}.run" --extract-only - cd "${_pkg}" - - # patches here - cp -a kernel kernel-dkms - cd kernel-dkms - sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf - sed -i 's/__JOBS/`nproc`/' dkms.conf - sed -i 's/__DKMS_MODULES//' dkms.conf - sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\ -DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\ -BUILT_MODULE_NAME[1]="nvidia-uvm"\ -DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\ -BUILT_MODULE_NAME[2]="nvidia-modeset"\ -DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\ -BUILT_MODULE_NAME[3]="nvidia-drm"\ -DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf -} - -build() { - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - cd "${_pkg}"/kernel - make SYSSRC=/usr/lib/modules/"${_kernver}/build" module -} - -package_nvidia() { - pkgdesc="NVIDIA drivers for linux" - depends=('linux>=4.7' 'linux<4.8' "nvidia-utils=${pkgver}" 'libgl') - install=nvidia.install - - install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" - install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-modeset.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-modeset.ko" - install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-drm.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-drm.ko" - - if [[ "$CARCH" = "x86_64" ]]; then - install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \ - "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko" - fi - - gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko - install -d -m755 "${pkgdir}/usr/lib/modprobe.d" - - echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" -} - -package_nvidia-dkms() { - pkgdesc="NVIDIA driver sources for linux" - depends=('dkms' "nvidia-utils=$pkgver" 'libgl') - optdepends=('linux-headers: Build the module for Arch kernel' - 'linux-lts-headers: Build the module for LTS Arch kernel') - conflicts+=('nvidia') - - cd ${_pkg} - install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src} - cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}" - echo 'blacklist nouveau' > "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" -} Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 274639, nvidia/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2016-08-25 13:42:09 UTC (rev 274640) @@ -0,0 +1,89 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Thomas Baechler <tho...@archlinux.org> + +pkgbase=nvidia +pkgname=(nvidia nvidia-dkms) +pkgver=370.23 +_extramodules=extramodules-4.7-ARCH +pkgrel=4 +pkgdesc="NVIDIA drivers for linux" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.7' 'linux-headers<4.8') +license=('custom') +options=('!strip') +source=(fix-abi.patch) +source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") +source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") +md5sums=('4ce4db437695790a73f132651a601889') +md5sums_i686=('7b7466e23ae6ffa97106c9749aee2628') +md5sums_x86_64=('cbe2cee787e07f8775a3fd994c9263a9') + +[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" +[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" + +prepare() { + sh "${_pkg}.run" --extract-only + cd "${_pkg}" + + # patches here + patch -Np0 -i ../fix-abi.patch + + cp -a kernel kernel-dkms + cd kernel-dkms + sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf + sed -i 's/__JOBS/`nproc`/' dkms.conf + sed -i 's/__DKMS_MODULES//' dkms.conf + sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\ +DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\ +BUILT_MODULE_NAME[1]="nvidia-uvm"\ +DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\ +BUILT_MODULE_NAME[2]="nvidia-modeset"\ +DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\ +BUILT_MODULE_NAME[3]="nvidia-drm"\ +DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf +} + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${_pkg}"/kernel + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module +} + +package_nvidia() { + pkgdesc="NVIDIA drivers for linux" + depends=('linux>=4.7' 'linux<4.8' "nvidia-utils=${pkgver}" 'libgl') + install=nvidia.install + + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-modeset.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-modeset.ko" + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-drm.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-drm.ko" + + if [[ "$CARCH" = "x86_64" ]]; then + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko" + fi + + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko + install -d -m755 "${pkgdir}/usr/lib/modprobe.d" + + echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" +} + +package_nvidia-dkms() { + pkgdesc="NVIDIA driver sources for linux" + depends=('dkms' "nvidia-utils=$pkgver" 'libgl') + optdepends=('linux-headers: Build the module for Arch kernel' + 'linux-lts-headers: Build the module for LTS Arch kernel') + conflicts+=('nvidia') + + cd ${_pkg} + install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src} + cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}" + echo 'blacklist nouveau' > "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" +} Copied: nvidia/repos/testing-x86_64/fix-abi.patch (from rev 274639, nvidia/trunk/fix-abi.patch) =================================================================== --- testing-x86_64/fix-abi.patch (rev 0) +++ testing-x86_64/fix-abi.patch 2016-08-25 13:42:09 UTC (rev 274640) @@ -0,0 +1,12 @@ +diff -u -r kernel/nvidia-drm/nvidia-drm-fence.c kernel-patched/nvidia-drm/nvidia-drm-fence.c +--- kernel/nvidia-drm/nvidia-drm-fence.c 2016-08-09 01:43:19.000000000 +0200 ++++ kernel-patched/nvidia-drm/nvidia-drm-fence.c 2016-08-25 14:31:34.419655564 +0200 +@@ -325,7 +325,7 @@ + struct nvidia_drm_gem_object *nv_gem; + }; + +-static void nvidia_drm_gem_prime_soft_fence_event ++static void NVKMS_KAPI_CALL nvidia_drm_gem_prime_soft_fence_event + ( + void *dataPtr, + NvU32 dataU32 Deleted: testing-x86_64/nvidia.install =================================================================== --- testing-x86_64/nvidia.install 2016-08-25 13:41:59 UTC (rev 274639) +++ testing-x86_64/nvidia.install 2016-08-25 13:42:09 UTC (rev 274640) @@ -1,13 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-4.7-ARCH' - depmod $(cat /usr/lib/modules/${EXTRAMODULES}/version) - echo 'In order to use nvidia module, reboot the system.' -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: nvidia/repos/testing-x86_64/nvidia.install (from rev 274639, nvidia/trunk/nvidia.install) =================================================================== --- testing-x86_64/nvidia.install (rev 0) +++ testing-x86_64/nvidia.install 2016-08-25 13:42:09 UTC (rev 274640) @@ -0,0 +1,13 @@ +post_install() { + EXTRAMODULES='extramodules-4.7-ARCH' + depmod $(cat /usr/lib/modules/${EXTRAMODULES}/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}