Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (1b74b5ae8cfea13a15bfe22386913a590c3d0800)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (1b74b5ae8cfea13a15bfe22386913a590c3d0800)
  • Date: Sat, 10 Sep 2016 08:45:18 +0000

GIT changes to master z-rejected grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:


z-kernels/nvidia_driver/0001-fix-multiple-definition-of-radix_tree_empty-beta.patch
| 28 -----

z-kernels/nvidia_driver/0001-fix-multiple-definition-of-radix_tree_empty-stable.patch
| 29 -----
z-kernels/nvidia_driver/DETAILS
| 12 +-
z-kernels/nvidia_driver/HISTORY
| 6 +
z-kernels/nvidia_driver/PRE_BUILD
| 12 --
z-kernels/nvidia_driver/linux-4.6.patch
| 50 ----------
6 files changed, 13 insertions(+), 124 deletions(-)

New commits:
commit 1b74b5ae8cfea13a15bfe22386913a590c3d0800
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

z-kernels/nvidia_driver: versions 367.44 and 370.28

diff --git
a/z-kernels/nvidia_driver/0001-fix-multiple-definition-of-radix_tree_empty-beta.patch

b/z-kernels/nvidia_driver/0001-fix-multiple-definition-of-radix_tree_empty-beta.patch
deleted file mode 100644
index 5a7ca01..0000000
---
a/z-kernels/nvidia_driver/0001-fix-multiple-definition-of-radix_tree_empty-beta.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 34220f2ff041303594b0a5c8c112ca2054550739 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Fri, 5 Aug 2016 10:41:23 +0200
-Subject: [PATCH] fix multiple definition of radix_tree_empty
-
----
- kernel/nvidia-uvm/uvm_linux.h | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/kernel/nvidia-uvm/uvm_linux.h b/kernel/nvidia-uvm/uvm_linux.h
-index 93dc997..bdeddf7 100644
---- a/kernel/nvidia-uvm/uvm_linux.h
-+++ b/kernel/nvidia-uvm/uvm_linux.h
-@@ -547,11 +547,5 @@ static void uvm_init_radix_tree_preloadable(struct
radix_tree_root *tree)
- INIT_RADIX_TREE(tree, GFP_NOWAIT);
- }
-
--static bool radix_tree_empty(struct radix_tree_root *tree)
--{
-- void *dummy;
-- return radix_tree_gang_lookup(tree, &dummy, 0, 1) == 0;
--}
--
- #endif // _UVM_LINUX_H
-
---
-2.9.2
-
diff --git
a/z-kernels/nvidia_driver/0001-fix-multiple-definition-of-radix_tree_empty-stable.patch

b/z-kernels/nvidia_driver/0001-fix-multiple-definition-of-radix_tree_empty-stable.patch
deleted file mode 100644
index a0c55d4..0000000
---
a/z-kernels/nvidia_driver/0001-fix-multiple-definition-of-radix_tree_empty-stable.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5e145a34ec70c53c46ccdc2c9f821a1dffacea4f Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Fri, 5 Aug 2016 10:24:54 +0200
-Subject: [PATCH] fix multiple definition of radix_tree_empty
-
----
- kernel/nvidia-uvm/uvm_linux.h | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/kernel/nvidia-uvm/uvm_linux.h b/kernel/nvidia-uvm/uvm_linux.h
-index e150687..796bdd2 100644
---- a/kernel/nvidia-uvm/uvm_linux.h
-+++ b/kernel/nvidia-uvm/uvm_linux.h
-@@ -554,12 +554,6 @@ static void uvm_init_radix_tree_preloadable(struct
radix_tree_root *tree)
- INIT_RADIX_TREE(tree, GFP_NOWAIT);
- }
-
--static bool radix_tree_empty(struct radix_tree_root *tree)
--{
-- void *dummy;
-- return radix_tree_gang_lookup(tree, &dummy, 0, 1) == 0;
--}
--
-
- #if !defined(NV_USLEEP_RANGE_PRESENT)
- static void __sched usleep_range(unsigned long min, unsigned long max)
---
-2.9.2
-
diff --git a/z-kernels/nvidia_driver/DETAILS b/z-kernels/nvidia_driver/DETAILS
index 7b5778d..520596e 100755
--- a/z-kernels/nvidia_driver/DETAILS
+++ b/z-kernels/nvidia_driver/DETAILS
@@ -1,15 +1,15 @@
. $GRIMOIRE/FUNCTIONS
SPELL=nvidia_driver
- STABLE_VERSION=367.35
- BETA_VERSION=364.19
+ STABLE_VERSION=367.44
+ BETA_VERSION=370.28
case "${SMGL_COMPAT_ARCHS[1]}" in
x86_64)
if [[ $NVIDIA_BETA == y ]]; then
VERSION=$BETA_VERSION
-
SOURCE_HASH=sha512:c02fea3eb0404e9f17eb6fdef43008c09653239b884fc599d3639f50a36b8d2708539c429e4b3be96d509c83ce5416145add7f152a3f08cada555617e9fcf1fc
+
SOURCE_HASH=sha512:931476f92a63d142478b2d6b3da4031769fd3b93aee2387800a78b1354b59a5fb5e4e293436b6b4c246627d51c0f55d140ab230de385cb1567bc8b25518eb741
else
VERSION=$STABLE_VERSION
-
SOURCE_HASH=sha512:18e2b1f342d1fc73c68f3c3ce526ab744fd7dd664cfd857849d497baf94eb057482d88444a792b64d3cd71ac624b9cbaae39b7f1884ca0370521cac0e5650d1b
+
SOURCE_HASH=sha512:efb97ee084f68a0d4ad658f8700fec14a3b3f5ec585a14efa88be791f951445d8b6b944103bfb95408aeb43618f1a1f6fda5ab4ad7f7d2de82f1a7e92f354fa1
fi
SOURCE=NVIDIA-Linux-x86_64-$VERSION.run

SOURCE_URL=http://us.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/$SOURCE
@@ -20,10 +20,10 @@
SOURCE_DIRECTORY="$BUILD_DIRECTORY/NVIDIA-Linux-x86_64-$VERSION"
ia32)
if [[ $NVIDIA_BETA == y ]]; then
VERSION=$BETA_VERSION
-
SOURCE_HASH=sha512:2b1cb0769d8c4d817588ab1071dbdbeda54291274392fd74009fc666bf198e6fcba1fe15db9d925a56ef98b147b48e58042a079b4f5773e95efe85531e25b01a
+
SOURCE_HASH=sha512:2df8b3d1064073c8b793287994fe0648625d095f3434b7b67531e19632cbad318994df90b55de18aa457d55a1374b35d64a646564259995d3f2197c48737921c
else
VERSION=$STABLE_VERSION
-
SOURCE_HASH=sha512:3151995153a3c3857e291df933dbaeaad779544a39a9482980ccb89531ca924d71e6bf0e44767755c484c4b693cfaf01f55e61e3d82cef79f73c0b1964411f39
+
SOURCE_HASH=sha512:5dbeda283b277697eb161b01a6d361a68fcc5e982fcbb9f6c9d08705c9af8b0bf3d78cf68feddce9d72407eea3ccabf955d404975fce5e56d1690bc5008577da
fi
SOURCE=NVIDIA-Linux-x86-$VERSION.run

SOURCE_URL=http://us.download.nvidia.com/XFree86/Linux-x86/$VERSION/$SOURCE
diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index 57b692b..185c2d1 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,9 @@
+2016-09-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: versions 367.44 and 370.28
+ * 0001-fix-multiple-definition-of-radix_tree_empty-beta.patch,
+ 0001-fix-multiple-definition-of-radix_tree_empty-stable.patch,
+ linux-4.6.patch, PRE_BUILD: remove obsolete patches
+
2016-08-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: stable version 367.35
* PRE_BUILD,
0001-fix-multiple-definition-of-radix_tree_empty-beta.patch,
0001-fix-multiple-definition-of-radix_tree_empty-stable.patch: fix
diff --git a/z-kernels/nvidia_driver/PRE_BUILD
b/z-kernels/nvidia_driver/PRE_BUILD
index c8752c9..e7d7ff2 100755
--- a/z-kernels/nvidia_driver/PRE_BUILD
+++ b/z-kernels/nvidia_driver/PRE_BUILD
@@ -6,9 +6,6 @@ sh $SOURCE_CACHE/$SOURCE --extract-only
\
--target $SOURCE_DIRECTORY &&
check_tmp_noexec /tmp &&
cd $SOURCE_DIRECTORY &&
-if [[ $NVIDIA_BETA == "y" ]]; then
- patch -p1 < "$SPELL_DIRECTORY/linux-4.6.patch"
-fi &&

# Fix defunct desktop file
sedit 's/__.*__\///' nvidia-settings.desktop &&
@@ -25,12 +22,5 @@ cd $SOURCE_DIRECTORY/kernel &&
# Modify module-install target to use `depmod -ae` on $KVER rather
# than the running kernel
#
-sedit 's:depmod -ae:& \$(KERNEL_UNAME):' Makefile &&
-
-cd "$SOURCE_DIRECTORY" &&
-if [[ $NVIDIA_BETA == n ]]; then
- patch -p1 <
"$SPELL_DIRECTORY/0001-fix-multiple-definition-of-radix_tree_empty-stable.patch"
-else
- patch -p1 <
"$SPELL_DIRECTORY/0001-fix-multiple-definition-of-radix_tree_empty-beta.patch"
-fi
+sedit 's:depmod -ae:& \$(KERNEL_UNAME):' Makefile

diff --git a/z-kernels/nvidia_driver/linux-4.6.patch
b/z-kernels/nvidia_driver/linux-4.6.patch
deleted file mode 100644
index 3dde473..0000000
--- a/z-kernels/nvidia_driver/linux-4.6.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/kernel/nvidia-drm/nvidia-drm-fb.c
-+++ b/kernel/nvidia-drm/nvidia-drm-fb.c
-@@ -77,7 +77,7 @@
- static struct drm_framebuffer *internal_framebuffer_create
- (
- struct drm_device *dev,
-- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd,
-+ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd,
- uint64_t nvkms_params_ptr,
- uint64_t nvkms_params_size
- )
-@@ -199,7 +199,7 @@
- struct drm_framebuffer *nvidia_drm_framebuffer_create
- (
- struct drm_device *dev,
-- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd
-+ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd
- )
- {
- return internal_framebuffer_create(dev, file, cmd, 0, 0);
---- a/kernel/nvidia-drm/nvidia-drm-fb.h
-+++ b/kernel/nvidia-drm/nvidia-drm-fb.h
-@@ -45,7 +45,7 @@
- struct drm_framebuffer *nvidia_drm_framebuffer_create
- (
- struct drm_device *dev,
-- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd
-+ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd
- );
-
- int nvidia_drm_add_nvkms_fb(
---- a/kernel/nvidia-drm/nvidia-drm-linux.c
-+++ b/kernel/nvidia-drm/nvidia-drm-linux.c
-@@ -31,6 +31,7 @@
-
- #if defined(NV_DRM_AVAILABLE)
-
-+#include "nv-mm.h"
- #include "nv-pgprot.h"
-
- MODULE_PARM_DESC(
-@@ -121,8 +122,7 @@
-
- down_read(&mm->mmap_sem);
-
-- pages_pinned = get_user_pages(current, mm,
-- address, pages_count, write, force,
-+ pages_pinned = NV_GET_USER_PAGES(address, pages_count, write, force,
- user_pages, NULL);
- up_read(&mm->mmap_sem);
\ No newline at end of file



  • [SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (1b74b5ae8cfea13a15bfe22386913a590c3d0800), Florian Franzmann, 09/10/2016

Archive powered by MHonArc 2.6.24.

Top of Page