[arch-commits] Commit in nvidia/trunk (4 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Thu Aug 25 13:32:06 UTC 2016
Date: Thursday, August 25, 2016 @ 13:32:05
Author: svenstaro
Revision: 274637
upgpkg: nvidia 370.23-3
rebuild
Added:
nvidia/trunk/fix-abi.patch
Modified:
nvidia/trunk/PKGBUILD
Deleted:
nvidia/trunk/0001-linux-4.7-i686.patch
nvidia/trunk/0001-linux-4.7-x86_64.patch
-----------------------------+
0001-linux-4.7-i686.patch | 46 --------------------------
0001-linux-4.7-x86_64.patch | 74 ------------------------------------------
PKGBUILD | 6 ++-
fix-abi.patch | 12 ++++++
4 files changed, 17 insertions(+), 121 deletions(-)
Deleted: 0001-linux-4.7-i686.patch
===================================================================
--- 0001-linux-4.7-i686.patch 2016-08-25 11:50:55 UTC (rev 274636)
+++ 0001-linux-4.7-i686.patch 2016-08-25 13:32:05 UTC (rev 274637)
@@ -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: 0001-linux-4.7-x86_64.patch
===================================================================
--- 0001-linux-4.7-x86_64.patch 2016-08-25 11:50:55 UTC (rev 274636)
+++ 0001-linux-4.7-x86_64.patch 2016-08-25 13:32:05 UTC (rev 274637)
@@ -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);
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-08-25 11:50:55 UTC (rev 274636)
+++ PKGBUILD 2016-08-25 13:32:05 UTC (rev 274637)
@@ -7,7 +7,7 @@
pkgname=(nvidia nvidia-dkms)
pkgver=370.23
_extramodules=extramodules-4.7-ARCH
-pkgrel=2
+pkgrel=3
pkgdesc="NVIDIA drivers for linux"
arch=('i686' 'x86_64')
url="http://www.nvidia.com/"
@@ -14,8 +14,10 @@
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')
@@ -27,6 +29,8 @@
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
Added: fix-abi.patch
===================================================================
--- fix-abi.patch (rev 0)
+++ fix-abi.patch 2016-08-25 13:32:05 UTC (rev 274637)
@@ -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
More information about the arch-commits
mailing list