Skip to Content.
Sympa Menu

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

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 (5d40730518e750aad0837604027f53b7774b5f51)
  • Date: Fri, 5 Aug 2016 08:47:57 +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
| 10 +
z-kernels/nvidia_driver/INSTALL
| 91 ++++------
z-kernels/nvidia_driver/PRE_BUILD
| 14 +
z-kernels/nvidia_driver/linux-4.6.patch
| 50 +++++
7 files changed, 177 insertions(+), 57 deletions(-)

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

z-kernels/nvidia_driver: stable version 367.35

commit 8ca9933457047de5ebc93951bd6d035c80561744
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 361.42 and 364.19

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
new file mode 100644
index 0000000..5a7ca01
--- /dev/null
+++
b/z-kernels/nvidia_driver/0001-fix-multiple-definition-of-radix_tree_empty-beta.patch
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 0000000..a0c55d4
--- /dev/null
+++
b/z-kernels/nvidia_driver/0001-fix-multiple-definition-of-radix_tree_empty-stable.patch
@@ -0,0 +1,29 @@
+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 356f705..7b5778d 100755
--- a/z-kernels/nvidia_driver/DETAILS
+++ b/z-kernels/nvidia_driver/DETAILS
@@ -1,15 +1,15 @@
. $GRIMOIRE/FUNCTIONS
SPELL=nvidia_driver
- STABLE_VERSION=352.63
- BETA_VERSION=358.16
+ STABLE_VERSION=367.35
+ BETA_VERSION=364.19
case "${SMGL_COMPAT_ARCHS[1]}" in
x86_64)
if [[ $NVIDIA_BETA == y ]]; then
VERSION=$BETA_VERSION
-
SOURCE_HASH=sha512:4ae43f5e8c311d6c97eb89b02504bf52e3a947c71662f30641988a78eb9fe083370124aeee3b89db74f8ee50f454338db98dc7abeb35a242ba5729fefccead77
+
SOURCE_HASH=sha512:c02fea3eb0404e9f17eb6fdef43008c09653239b884fc599d3639f50a36b8d2708539c429e4b3be96d509c83ce5416145add7f152a3f08cada555617e9fcf1fc
else
VERSION=$STABLE_VERSION
-
SOURCE_HASH=sha512:37b38be1e9394aa8bdd33cfbdf3c16ed62b16f852f76e013fb5573803e057ac51f6728ff594f7d48008871d9503fe64bb6e2dfc00b4415a62894f7f26c6ad719
+
SOURCE_HASH=sha512:18e2b1f342d1fc73c68f3c3ce526ab744fd7dd664cfd857849d497baf94eb057482d88444a792b64d3cd71ac624b9cbaae39b7f1884ca0370521cac0e5650d1b
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:a5d37fb56a59b9958f6c34139250baf13a1c42ffc70f7deb19ffaac1ae6c2ce80b96649c5797d60754050d75792d14141cd5ebc8820bb73ee4aad4aa6d6c5b20
+
SOURCE_HASH=sha512:2b1cb0769d8c4d817588ab1071dbdbeda54291274392fd74009fc666bf198e6fcba1fe15db9d925a56ef98b147b48e58042a079b4f5773e95efe85531e25b01a
else
VERSION=$STABLE_VERSION
-
SOURCE_HASH=sha512:499e9949d0221e40c8050a589e5d174d8c38108152948876cd9e523ce9d3b7f85646c40c76d2af032ead848d6508189afaa27226100d72b0484ce3634d3434a8
+
SOURCE_HASH=sha512:3151995153a3c3857e291df933dbaeaad779544a39a9482980ccb89531ca924d71e6bf0e44767755c484c4b693cfaf01f55e61e3d82cef79f73c0b1964411f39
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 a37bf29..57b692b 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,13 @@
+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
+ build against linux 4.7
+ * PRE_BUILD, linux-4.6.patch: fix build of beta version against linux
4.6
+ * INSTALL: install the right files
+
+2016-05-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: stable version 361.42, beta version 364.19
+
2016-01-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: stable version 352.63, beta version 358.16

diff --git a/z-kernels/nvidia_driver/INSTALL b/z-kernels/nvidia_driver/INSTALL
index 653564b..69261ec 100755
--- a/z-kernels/nvidia_driver/INSTALL
+++ b/z-kernels/nvidia_driver/INSTALL
@@ -1,11 +1,6 @@
local X_MOD KVER &&
-KVER=$(get_kernel_version) &&
-
-if [[ "$NVIDIA_BETA" == "n" ]]; then
- MAKEFILE=Makefile
-else
- MAKEFILE=Makefile
-fi &&
+KVER=$(get_kernel_version) &&
+MAKEFILE=Makefile &&
#
# Install kernel module 'nvidia.ko'
#
@@ -13,7 +8,7 @@ cd $SOURCE_DIRECTORY/kernel &&
make KERNEL_MODLIB=$INSTALL_ROOT/lib/modules/$KVER \
KERNEL_UNAME=$KVER \
SYSSRC=$INSTALL_ROOT/lib/modules/$KVER/source \
- -f $MAKEFILE module-install &&
+ -f $MAKEFILE modules_install &&
cd $SOURCE_DIRECTORY &&

#
@@ -31,7 +26,7 @@ install -v -m 0766 -o root -g root nvidia-installer
$INSTALL_ROOT/usr/bin &
#
# Install OpenGL headers
#
-mkdir -vp $INSTALL_ROOT/usr/include/GL/.nvidia
+mkdir -vp $INSTALL_ROOT/usr/include/GL/.nvidia &&
for file in glext.h gl.h glxext.h glx.h; do
install -v -m 0644 -o root -g root $file
$INSTALL_ROOT/usr/include/GL/.nvidia/
done &&
@@ -41,7 +36,8 @@ done &&
#

# Fill in the path to libGL.so
-sed -i 's|__LIBGL_PATH__|/usr/lib|' libGL.la
+sed -i 's|__LIBGL_PATH__|/usr/lib|' $SOURCE_DIRECTORY/libGL.la &&
+cd $SOURCE_DIRECTORY &&
for lib in libGL.la libnvidia-glcore.so.${VERSION/-/.} \
libnvidia-tls.so.${VERSION/-/.} libnvidia-cfg.so.${VERSION/-/.} \
libnvidia-compiler.so.${VERSION/-/.}
libnvidia-wfb.so.${VERSION/-/.} \
@@ -53,52 +49,49 @@ done &&
mkdir -vp $INSTALL_ROOT/usr/lib/.nvidia \
$INSTALL_ROOT/usr/lib/xorg/modules/extensions/.nvidia/ &&
cp -vr libGL.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
-cp -vr libEGL.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
-cp -vr libGLESv1_CM.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
-cp -vr libGLESv2.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
+cp -vr libEGL_nvidia.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
+cp -vr libGLESv1_CM_nvidia.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
+cp -vr libGLESv2_nvidia.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/.nvidia &&
mkdir -vp $INSTALL_ROOT/usr/lib/tls &&
install -v -m 0644 -o root -g root tls/libnvidia-tls.so.${VERSION/-/.} \
$INSTALL_ROOT/usr/lib/tls &&
- #
- # Create library symlinks
- #
- pushd $INSTALL_ROOT/usr/lib/.nvidia &&
- ln -sfn libGL.so.${VERSION/-/.} libGL.so.1 &&
- ln -sfn libGL.so.1 libGL.so &&
- ln -sfn libEGL.so.${VERSION/-/.} libEGL.so.1 &&
- ln -sfn libEGL.so.1 libEGL.so &&
- ln -sfn libGLESv1_CM.so.${VERSION/-/.} libGLESv1_CM.so.1 &&
- ln -sfn libGLESv1_CM.so.1 libGLESv1_CM.so &&
- ln -sfn libGLESv2.so.${VERSION/-/.} libGLESv2.so.1 &&
- ln -sfn libGLESv2.so.1 libGLESv2.so &&
- popd
- pushd $INSTALL_ROOT/usr/lib &&
- ln -sfn libnvidia-glcore.so.${VERSION/-/.} libGLcore.so.1 &&
- ln -sfn libnvidia-cfg.so.${VERSION/-/.} libnvidia-cfg.so.1 &&
- ln -sfn libnvidia-cfg.so.1 libnvidia-cfg.so &&
- ln -sfn libnvidia-tls.so.${VERSION/-/.} libnvidia-tls.so.1 &&
- popd &&
- pushd $INSTALL_ROOT/usr/lib/tls &&
- ln -sfn libnvidia-tls.so.${VERSION/-/.} libnvidia-tls.so.1 &&
- popd &&
+#
+# Create library symlinks
+#
+pushd $INSTALL_ROOT/usr/lib/.nvidia &&
+ln -sfn libGL.so.${VERSION/-/.} libGL.so.1 &&
+ln -sfn libGL.so.1 libGL.so &&
+ln -sfn libEGL_nvidia.so.${VERSION/-/.} libEGL.so.1 &&
+ln -sfn libEGL.so.1 libEGL.so &&
+ln -sfn libGLESv1_CM_nvidia.so.${VERSION/-/.} libGLESv1_CM.so.1 &&
+ln -sfn libGLESv1_CM.so.1 libGLESv1_CM.so &&
+ln -sfn libGLESv2_nvidia.so.${VERSION/-/.} libGLESv2.so.1 &&
+ln -sfn libGLESv2.so.1 libGLESv2.so &&
+popd &&
+pushd $INSTALL_ROOT/usr/lib &&
+ln -sfn libnvidia-glcore.so.${VERSION/-/.} libGLcore.so.1 &&
+ln -sfn libnvidia-cfg.so.${VERSION/-/.} libnvidia-cfg.so.1 &&
+ln -sfn libnvidia-cfg.so.1 libnvidia-cfg.so &&
+ln -sfn libnvidia-tls.so.${VERSION/-/.} libnvidia-tls.so.1 &&
+popd &&
+pushd $INSTALL_ROOT/usr/lib/tls &&
+ln -sfn libnvidia-tls.so.${VERSION/-/.} libnvidia-tls.so.1 &&
+popd &&

#
# Install X11 modules
#
-mkdir -vp $INSTALL_ROOT/usr/lib/xorg/modules/drivers
&&
-for driver in nvidia_drv.so; do
- install -v -m 0644 -o root -g root \
- $driver $INSTALL_ROOT/usr/lib/xorg/modules/drivers/
-done &&
-install -v -m 0644 -o root -g root libglx.so.${VERSION/-/.} \
- $INSTALL_ROOT/usr/lib/xorg/modules/extensions/.nvidia &&
+mkdir -vp $INSTALL_ROOT/usr/lib/xorg/modules/drivers &&
+install -v -m 0644 -o root -g root nvidia_drv.so
$INSTALL_ROOT/usr/lib/xorg/modules/drivers/ &&
+install -v -m 0644 -o root -g root libglx.so.${VERSION/-/.}
$INSTALL_ROOT/usr/lib/xorg/modules/extensions/.nvidia/ &&
+install -v -m 0644 -o root -g root libGLX_nvidia.so.${VERSION/-/.}
$INSTALL_ROOT/usr/lib/.nvidia/ &&
#
# Setup symlinks
#
pushd $INSTALL_ROOT/usr/lib/xorg/modules/extensions/.nvidia &&
ln -sfn libglx.so.${VERSION/-/.} libglx.so &&
popd &&
-
+ln -sfn /usr/lib/.nvidia/libGLX_nvidia.so.${VERSION/-/.}
$INSTALL_ROOT/usr/lib/libGLX_indirect.so.0 &&
#
# Install Cuda headers
#
@@ -132,26 +125,24 @@ done &&
#
# Install VDPAU libraries
#
-for lib in libvdpau.so.${VERSION/-/.}; do
+for lib in libvdpau_nvidia.so.${VERSION/-/.}; do
install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib/
done &&
-mkdir -vp $INSTALL_ROOT/usr/lib/vdpau
-for lib in libvdpau_nvidia.so.${VERSION/-/.}
libvdpau_trace.so.${VERSION/-/.}; do
+mkdir -vp $INSTALL_ROOT/usr/lib/vdpau
&&
+for lib in libvdpau_nvidia.so.${VERSION/-/.}; do
install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib/vdpau/
done &&
#
# Setup symlinks
#
pushd $INSTALL_ROOT/usr/lib
&&
- ln -sfn libvdpau.so.${VERSION/-/.} libvdpau.so.1
&&
+ ln -sfn libvdpau_nvidia.so.${VERSION/-/.} libvdpau.so.1
&&
ln -sfn libvdpau.so.1 libvdpau.so
&&
popd
&&
pushd $INSTALL_ROOT/usr/lib/vdpau
&&
ln -sfn libvdpau_nvidia.so.${VERSION/-/.} libvdpau_nvidia.so.1
&&
ln -sfn libvdpau_nvidia.so.1 libvdpau_nvidia.so
&&
- ln -sfn libvdpau_trace.so.${VERSION/-/.} libvdpau_trace.so.1
&&
- ln -sfn libvdpau_trace.so.1 libvdpau_trace.so
&&
- popd &&
+ popd
&&

#
# Install OpenCL headers
diff --git a/z-kernels/nvidia_driver/PRE_BUILD
b/z-kernels/nvidia_driver/PRE_BUILD
index 920f631..c8752c9 100755
--- a/z-kernels/nvidia_driver/PRE_BUILD
+++ b/z-kernels/nvidia_driver/PRE_BUILD
@@ -1,10 +1,14 @@
unpack_file '' &&

+
check_tmp_noexec /tmp &&
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 &&
@@ -21,4 +25,12 @@ 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
+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
+
diff --git a/z-kernels/nvidia_driver/linux-4.6.patch
b/z-kernels/nvidia_driver/linux-4.6.patch
new file mode 100644
index 0000000..3dde473
--- /dev/null
+++ b/z-kernels/nvidia_driver/linux-4.6.patch
@@ -0,0 +1,50 @@
+--- 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 (5d40730518e750aad0837604027f53b7774b5f51), Florian Franzmann, 08/05/2016

Archive powered by MHonArc 2.6.24.

Top of Page