[arch-commits] Commit in nvidia/trunk (0001-linux-4.7-x86_64.patch PKGBUILD)
Sven-Hendrik Haase
svenstaro at archlinux.org
Mon Aug 22 20:09:34 UTC 2016
Date: Monday, August 22, 2016 @ 20:09:34
Author: svenstaro
Revision: 274583
upgpkg: nvidia 370.23-1
upstream release 370.23
Modified:
nvidia/trunk/0001-linux-4.7-x86_64.patch
nvidia/trunk/PKGBUILD
-----------------------------+
0001-linux-4.7-x86_64.patch | 116 ++++++++++++++++++++++--------------------
PKGBUILD | 18 ++----
2 files changed, 70 insertions(+), 64 deletions(-)
Modified: 0001-linux-4.7-x86_64.patch
===================================================================
--- 0001-linux-4.7-x86_64.patch 2016-08-22 19:50:38 UTC (rev 274582)
+++ 0001-linux-4.7-x86_64.patch 2016-08-22 20:09:34 UTC (rev 274583)
@@ -1,64 +1,74 @@
-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"
-
+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>
-+#include <linux/version.h>
-
- static void nvidia_framebuffer_destroy(struct drm_framebuffer *fb)
+
+@@ -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)
{
-@@ -114,7 +115,11 @@
+ 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.
*/
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
+
+- gem = drm_gem_object_lookup(dev, file, cmd->handles[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 @@
-
+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);
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
+
+- gem = drm_gem_object_lookup(dev, file, handle);
+ 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)
+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);
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-08-22 19:50:38 UTC (rev 274582)
+++ PKGBUILD 2016-08-22 20:09:34 UTC (rev 274583)
@@ -5,9 +5,9 @@
pkgbase=nvidia
pkgname=(nvidia nvidia-dkms)
-pkgver=367.35
+pkgver=370.23
_extramodules=extramodules-4.7-ARCH
-pkgrel=3
+pkgrel=1
pkgdesc="NVIDIA drivers for linux"
arch=('i686' 'x86_64')
url="http://www.nvidia.com/"
@@ -14,14 +14,10 @@
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')
+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"
@@ -30,7 +26,7 @@
sh "${_pkg}.run" --extract-only
cd "${_pkg}"
- patch -Np1 -d kernel < ../0001-linux-4.7-${CARCH}.patch
+ # patches here
cp -a kernel kernel-dkms
cd kernel-dkms
sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
More information about the arch-commits
mailing list